diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 11eb1112..8ff61960 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -1693,15 +1693,20 @@ softwarePlugins:
       - snyk/snyk-docker-desktop-extension:0.7.4
       - tailscale/docker-extension:1.0.1
     when: docker extension list &> /dev/null
-  docker_images:
-    cmd: null
+  docker-images:
+    cmd: bash -c 'if ! docker image list | awk \'{print $1 " " $2}\' | grep "{PLUGIN}" > /dev/null; then docker pull "{PLUGIN}"; fi'
     plugins:
-      - docker.io/nginx/unit
-  docker_plugins:
-    cmd: bash -c 'if ! docker plugin ls | grep "{PLUGIN}" > /dev/null; then docker plugin install "{PLUGIN}"; fi'
+      - alpine:latest
+      - postgres:10
+      - postgres:12
+      - postgres:latest
+      - ubuntu:latest
+  docker-plugins:
+    cmd: bash -c 'if ! docker plugin ls | grep "{PLUGIN}" > /dev/null; then echo y | docker plugin install "{PLUGIN}"; fi'
     plugins:
       - sapk/plugin-rclone
       - vieux/sshfs
+    when: docker plugin ls &> /dev/null
   dotnet:
     cmd: bash -c 'if ! dotnet tool list -g | grep "{PLUGIN}" > /dev/null; then dotnet tool install -g "{PLUGIN}"; fi'
     plugins:
diff --git a/software.yml b/software.yml
index a83bf090..cc420bbf 100644
--- a/software.yml
+++ b/software.yml
@@ -10518,6 +10518,8 @@ softwarePackages:
     _app: Browserosaurus.app
     cask: browserosaurus
   docker:
+    _deps:
+      - docker-images
     _bin: docker
     _desc: null
     _docs: null
@@ -10545,6 +10547,11 @@ softwarePackages:
       - docker-ce
       - docker-ce-cli
       - docker-compose-plugin
+  docker-images:
+    _desc: This entry is used to trigger a post-installation docker image pre-load. See the `docker-images` entry in `.chezmoidata.yaml`.
+    script: echo "Enabling docker-images pre-load"
+  docker-plugins:
+    _desc: This entry is used to trigger a post-installation Docker plugin installation. See `docker-plugins` entry in `.chezmoidata.yaml`.
   openssh-server:
     _service: sshd
     _when: test -f /proc/version && ! grep Microsoft /proc/version > /dev/null && ! test -d /Applications'