diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c1b9c29ea1e8ae8f0037e5a1c49ab65dd97a166..1fcf0efe124030c1f568fa9ab4b8bd65b4d01f8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ build-golang-dev:
   except:
     - master
 
-# Debian Stretch builds
+# Debian Busters builds
 build-debian-buster-build-master:
   stage: deploy
   script:
@@ -66,7 +66,7 @@ build-debian-buster-build-dev:
     - docker push "$CI_REGISTRY_IMAGE/debian:buster-dev"
   except:
     - master
-     
+
 # Debian Stretch builds
 build-debian-stretch-build-master:
   stage: deploy
@@ -103,6 +103,24 @@ build-debian-jessie-build-dev:
   except:
     - master
 
+# Debian WP.org Plugin deploy builds
+build-debian-wp-org-deploy-build-master:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:wp-org-deploy" ./debian/wp-org-deploy
+    - docker push "$CI_REGISTRY_IMAGE/debian:wp-org-deploy"
+  only:
+    - master
+  when: manual
+
+build-debian-wp-org-deploy-build-dev:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:wp-org-deploy-dev" ./debian/wp-org-deploy
+    - docker push "$CI_REGISTRY_IMAGE/debian:wp-org-deploy-dev"
+  except:
+    - master
+
 # PHP 7.3
 build-php-7.3-master:
   stage: deploy
diff --git a/debian/wp-org-deploy/Dockerfile b/debian/wp-org-deploy/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..ece152050fd7021a7dbf7b0e757d241c22bda4ef
--- /dev/null
+++ b/debian/wp-org-deploy/Dockerfile
@@ -0,0 +1,16 @@
+FROM debian:stretch-slim
+
+LABEL maintainer="ethitter"
+LABEL version="1.0"
+
+RUN echo "deb http://security.debian.org/ stretch/updates main" >> /etc/apt/sources.list
+
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install \
+        ca-certificates \
+        curl \
+        git \
+        rsync \
+        subversion \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*