diff --git a/salt/common/init.sls b/salt/common/init.sls
index 17cbb1608..77801dd1a 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -38,11 +38,11 @@ epel:
 {% endif %}
 
 # Install common packages
+{% if grains['os'] != 'CentOS' %}     
 commonpkgs:
   pkg.installed:
     - skip_suggestions: True
     - pkgs:
-      {% if grains['os'] != 'CentOS' %}
       - apache2-utils
       - wget
       - jq
@@ -61,23 +61,19 @@ commonpkgs:
       - python3-dateutil
       - python3-m2crypto
       - python3-mysqldb
-      - salt-minion: 2019.2.5+ds-1
-        - hold: True
-        - update_holds: True
-      {% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' or grains['role'] == 'so-helix' or grains['role'] == 'so-mastersearch' or grains['role'] == 'so-standalone' %}
-      - salt-master: 2019.2.5+ds-1
-        - hold: True
-        - update_holds: True
+heldpackages:
+  pkg.installed:
+    - pkgs:
       - containerd.io: 1.2.13-2
-        - hold: True
-        - update_holds: True
       - docker-ce: 5:19.03.9~3-0~ubuntu-bionic
-        - hold: True
-        - update_holds: True
-      {% endif %}
-      - containerd.io
-      - docker-ce      
-      {% else %}
+    - hold: True
+    - update_holds: True
+
+{% else %}
+commonpkgs:
+  pkg.installed:
+    - skip_suggestions: True
+    - pkgs:
       - wget
       - bind-utils
       - jq
@@ -87,33 +83,27 @@ commonpkgs:
       - curl
       - sqlite
       - argon2
-      - maridb-devel
+      - mariadb-devel
       - nmap-ncat
       - python3
-			-	python36-docker
-			-	python36-dateutil
-			-	python36-m2crypto
-			-	python36-mysql
-			-	yum-utils
-			-	device-mapper-persistent-data
-			-	lvm2
-			-	openssl
-      - salt-minion: 2019.2.5.el7
-        - hold: True
-        - update_holds: True
-      {% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' or grains['role'] == 'so-helix' or grains['role'] == 'so-mastersearch' or grains['role'] == 'so-standalone' %}
-      - salt-master: 2019.2.5.el7
-        - hold: True
-        - update_holds: True
-      {% endif %}
-      - containerd.io: 1.2.6-3.el7
-        - hold: True
-        - update_holds: True
-      - docker-ce: 19.03.9-3.el7
-        - hold: True
-        - update_holds: True
-      {% endif %}%}
-				
+      - python36-docker
+      - python36-dateutil
+      - python36-m2crypto
+      - python36-mysql
+      - yum-utils
+      - device-mapper-persistent-data
+      - lvm2
+      - openssl
+
+heldpackages:
+  pkg.installed:
+    - pkgs:
+      - containerd.io: 1.2.13-3.2.el7
+      - docker-ce: 3:19.03.9-3.el7
+    - hold: True
+    - update_holds: True
+{% endif %}
+
 # Always keep these packages up to date
 
 alwaysupdated: