diff --git a/defaults/main.yml b/defaults/main.yml
index 9d63a1b..e38ab01 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,9 +16,10 @@
 ## Verbosity Options
 debug: False
 
-# Set the package install state for distribution packages
+# Set the package install state for distribution and pip packages
 # Options are 'present' and 'latest'
 cloudkitty_package_state: "latest"
+cloudkitty_pip_package_state: "latest"
 
 cloudkitty_username: cloudkitty
 
diff --git a/handlers/main.yml b/handlers/main.yml
index c2f4ac3..67b2c4a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -19,8 +19,7 @@
     - Restart cloudkitty services
 
 - name: Reload upstart init scripts
-  shell: |
-    initctl reload-configuration
+  command: initctl reload-configuration
   notify:
     - Restart cloudkitty services
 
diff --git a/tasks/cloudkitty_db_setup.yml b/tasks/cloudkitty_db_setup.yml
index f0840af..89d6306 100644
--- a/tasks/cloudkitty_db_setup.yml
+++ b/tasks/cloudkitty_db_setup.yml
@@ -45,6 +45,7 @@
   command: "{{ cloudkitty_bin }}/cloudkitty-dbsync upgrade"
   become: yes
   become_user: "{{ cloudkitty_system_user_name }}"
+  changed_when: false
   tags:
     - cloudkitty-db-sync
     - cloudkitty-setup
@@ -54,6 +55,7 @@
   command: "{{ cloudkitty_bin }}/cloudkitty-storage-init"
   become: yes
   become_user: "{{ cloudkitty_system_user_name }}"
+  changed_when: false
   tags:
     - cloudkitty-db-sync
     - cloudkitty-setup
diff --git a/tasks/cloudkitty_install.yml b/tasks/cloudkitty_install.yml
index 0afde13..06d7928 100644
--- a/tasks/cloudkitty_install.yml
+++ b/tasks/cloudkitty_install.yml
@@ -42,7 +42,7 @@
 - name: Install requires pip packages
   pip:
     name: "{{ cloudkitty_requires_pip_packages | join(' ') }}"
-    state: latest
+    state: "{{ cloudkitty_pip_package_state }}"
     extra_args: >-
       {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
       {{ pip_install_options | default('') }}
@@ -139,7 +139,7 @@
 - name: Install pip packages
   pip:
     name: "{{ cloudkitty_pip_packages | join(' ') }}"
-    state: latest
+    state: "{{ cloudkitty_pip_package_state }}"
     virtualenv: "{{ cloudkitty_bin | dirname }}"
     virtualenv_site_packages: "no"
     extra_args: >-
diff --git a/tasks/main.yml b/tasks/main.yml
index 732ee7c..39ff13f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -28,6 +28,7 @@
 
 - name: Check init system
   command: cat /proc/1/comm
+  changed_when: false
   register: _pid1_name
   tags:
     - always