diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 27a5277b85fc915bdb976d9aadb41f0d399437c7..93692b7528199c49cc1c42e558c19e90fb2f563e 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 
-#- name: Upgrade existing packages
-#  apt:
-#    update_cache: true
-#    upgrade: true
+- name: Upgrade existing packages
+  apt:
+    update_cache: true
+    upgrade: true
 
 - name: Set hostname
   copy:
@@ -58,7 +58,7 @@
 - name: Install base packages
   apt:
     name: "{{ packages }}"
-    state: latest
+    state: present
   vars:
     packages:
       - bsd-mailx
diff --git a/roles/monitor/tasks/grafana.yml b/roles/monitor/tasks/grafana.yml
index 73184c301f5deb723c9c4cf5fef84b3d3ddda011..4de1f042b176200382960eb87a96f49cb747615e 100644
--- a/roles/monitor/tasks/grafana.yml
+++ b/roles/monitor/tasks/grafana.yml
@@ -14,7 +14,7 @@
 - name: Install Grafana
   apt:
     name: grafana
-    state: latest
+    state: present
 
 - name: Remove Grafana sample config
   file:
diff --git a/roles/monitor/tasks/main.yml b/roles/monitor/tasks/main.yml
index 6aca35ff0e0801e8a15fa34d8aaf96622de3ff1c..594c04d29a2cd61ee239acf4b54d6c6cf8c54cd6 100644
--- a/roles/monitor/tasks/main.yml
+++ b/roles/monitor/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: Install monitoring packages
   apt:
     name: "{{ packages }}"
-    state: latest
+    state: present
   vars:
     packages:
       - nginx
diff --git a/roles/monitor/tasks/prometheus.yml b/roles/monitor/tasks/prometheus.yml
index 6de0ed7239065604f687d6eeb4497763f721ce20..056ea28e6fe43944c0999ae6a8c7f4d3cb64939e 100644
--- a/roles/monitor/tasks/prometheus.yml
+++ b/roles/monitor/tasks/prometheus.yml
@@ -20,7 +20,7 @@
 - name: Install Prometheus
   apt:
     name: "{{ packages }}"
-    state: latest
+    state: present
   vars:
     packages:
       - prometheus