diff --git a/postgres/init.sls b/postgres/init.sls
index 4cebb32..a28a0ed 100644
--- a/postgres/init.sls
+++ b/postgres/init.sls
@@ -4,7 +4,6 @@ include:
   - postgres.macos
 {% else %}
   - postgres.server
-  - postgres.server.image
   - postgres.client
   - postgres.manage
 {% endif %}
diff --git a/postgres/server/image.sls b/postgres/server/image.sls
index d70ee21..2de0886 100644
--- a/postgres/server/image.sls
+++ b/postgres/server/image.sls
@@ -18,6 +18,8 @@ postgresql-running:
 postgresql-service-reload:
   module.run:
     - name: test.true
+    - require:
+      - cmd: postgresql-running
 
 # Try to enable PostgreSQL in "manual" way
 
diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index 0a66e93..ce1d575 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -1,6 +1,9 @@
 {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 {%- set includes = [] %}
+{%- if postgres.bake_image %}
+  {%- do includes.append('postgres.server.image') %}
+{%- endif %}
 {%- if postgres.use_upstream_repo == true -%}
   {%- do includes.append('postgres.upstream') %}
 {%- endif %}
diff --git a/postgres/upstream.sls b/postgres/upstream.sls
index 44e7f9d..0fe9ff9 100644
--- a/postgres/upstream.sls
+++ b/postgres/upstream.sls
@@ -26,6 +26,8 @@ postgresql-pkg-deps:
 postgresql-repo:
   pkgrepo.managed:
     {{- format_kwargs(postgres.pkg_repo) }}
+    - require:
+      - pkg: postgresql-pkg-deps
 
   {%- else -%}