diff --git a/deepsea/config.sls b/deepsea/config.sls
index 3564ea8..0340c84 100644
--- a/deepsea/config.sls
+++ b/deepsea/config.sls
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 
-{% from "deepsea/map.jinja" import deepsea with context -%}
+{%- from "deepsea/map.jinja" import deepsea with context %}
 
 deepsea-config-global:
   file.line:
diff --git a/deepsea/defaults.yaml b/deepsea/defaults.yaml
index a6a1edb..2992f78 100644
--- a/deepsea/defaults.yaml
+++ b/deepsea/defaults.yaml
@@ -31,10 +31,12 @@ deepsea:
     # ideally `DeepSea` (or `packages-formula`) handle package dependencies.
     managed: False
     required:
-      - python-setuptools
-      - python3
+      - python3-setuptools
       - python3-boto
+      - python3-configobj
+      - python3-click
       - python3-rados
+      - python3-tox
       - lsscsi
       - jq     # needs epel on centos
       - pciutils
diff --git a/deepsea/install.sls b/deepsea/install.sls
index 6bcb8ff..6915f77 100644
--- a/deepsea/install.sls
+++ b/deepsea/install.sls
@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 
-{% from "deepsea/map.jinja" import deepsea with context -%}
+{%- from "deepsea/map.jinja" import deepsea with context %}
 
 include:
   - deepsea.config
   - deepsea.service
-   {% if deepsea.packages.managed %}
-  - deepsea.packages
-   {% endif %}
 
 deepsea-directories:
   file.directory:
@@ -26,8 +23,18 @@ deepsea-directories:
     - require_in:
       - file: deepsea-software
 
+   {%- if deepsea.packages.managed and deepsea.packages.required %}
+deepsea-packages-common-dependencies:
+  pkg.installed:
+    - pkgs:
+      - make
+      - {{ deepsea.packages.required|json }}
+    - require_in:
+      - cmd: deepsea-software
+   {% endif %}
+
 deepsea-software:
-   {% if deepsea.use_upstream_pkgrepo %}
+   {%- if deepsea.use_upstream_pkgrepo %}
   pkgrepo.managed:
     - name: deepsea-{{ deepsea.release }}
     - humanname: {{ deepsea.repo.name }}
@@ -40,10 +47,8 @@ deepsea-software:
   pkg.installed:
     - name: deepsea
 
-   {% else %}
+   {%- else %}
 
-  pkg.installed:
-    - name: make
   pkgrepo.absent:
     - name: deepsea-{{ deepsea.release }}
     - require_in:
@@ -65,10 +70,13 @@ deepsea-software:
   cmd.run:
     - name: make install
     - cwd: {{ deepsea.tmpdir }}/DeepSea
-   {% endif %}
+   {%- endif %}
+    - require_in:
+      - file: deepsea-config-global
     - require:
       - file: deepsea-directories
       - pkg: deepsea-software
       - pkgrepo: deepsea-software
-    - require_in:
-      - file: deepsea-config-global
+             {%- if deepsea.packages.managed and deepsea.packages.required %}
+      - pkg: deepsea-packages-common-dependencies
+             {%- endif %}
diff --git a/deepsea/osfamilymap.yaml b/deepsea/osfamilymap.yaml
index c11e2b1..e79586a 100644
--- a/deepsea/osfamilymap.yaml
+++ b/deepsea/osfamilymap.yaml
@@ -21,17 +21,12 @@ Suse:
       - gptfdisk
       - iperf
       - lsof
-      - python3-setuptools
-      - python3-click
-      - python3-tox
-      - python3-configobj
 
 Debian:
   packages:
     required:
       - gdisk
       - iperf
-      - python-tox
 
 RedHat:
   services:
@@ -40,11 +35,7 @@ RedHat:
       - salt-minion
   packages:
     required:
-      - python-setuptools
-      - python-configobj
-      - python-click
-      - python-tox
-      - python-netaddr
+      - python3-netaddr
       - iperf3
       - gdisk
       - lshw
diff --git a/deepsea/packages.sls b/deepsea/packages.sls
deleted file mode 100644
index 7cd581c..0000000
--- a/deepsea/packages.sls
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-
-{% from "deepsea/map.jinja" import deepsea with context -%}
-
-deepsea-packages-common-dependencies:
-  pkg.installed:
-    - pkgs:
-      - make
-      {% for pkg in deepsea.packages.required %}
-      - {{ pkg }}
-      {% endfor %}
diff --git a/deepsea/remove.sls b/deepsea/remove.sls
index 0a30ac2..b50c6fa 100644
--- a/deepsea/remove.sls
+++ b/deepsea/remove.sls
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 
-{% from "deepsea/map.jinja" import deepsea with context %}
+{%- from "deepsea/map.jinja" import deepsea with context %}
 
 deepsea-cleanup:
   file.absent:
diff --git a/deepsea/service.sls b/deepsea/service.sls
index d089bb5..0370c0a 100644
--- a/deepsea/service.sls
+++ b/deepsea/service.sls
@@ -1,16 +1,15 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-
 {% from "deepsea/map.jinja" import deepsea with context %}
 
-     {% for svc in deepsea.services.running %}
+     {%- for svc in deepsea.services.running %}
 deepsea-{{ svc }}-running:
   service.running:
     - name: {{ svc }}
     - enable: True
      {% endfor %}
 
-     {% for svc in deepsea.services.dead %}
+     {%- for svc in deepsea.services.dead %}
 deepsea-{{ svc }}-notrunning:
   service.dead:
     - name: {{ svc }}