diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
index e1132818d..8c7208e84 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
@@ -107,6 +107,25 @@ services:
 #    networks:
 #      - proxy-tier
 
+#Self-signed Certificate Generator (Replaces omgwtfssl)
+  cert-generator:
+    image: frapsoft/openssl
+    container_name: cert-generator-postgres-fpm
+    command: >
+      sh -c "
+      openssl req -x509 -nodes -days 365 -newkey rsa:2048
+        -keyout /certs/servhostname.local.key
+        -out /certs/servhostname.local.crt
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'
+      && openssl req -new -key /certs/servhostname.local.key
+        -out /certs/servhostname.local.csr
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'"
+    volumes:
+      - certs:/certs
+    restart: "no"
+    networks:
+      - proxy-tier
+
 volumes:
   db:
   nextcloud:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
index 13d4a40b4..e72067542 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
@@ -120,6 +120,25 @@ services:
 #    networks:
 #      - proxy-tier
 
+#Self-signed Certificate Generator (Replaces omgwtfssl)
+  cert-generator:
+    image: frapsoft/openssl
+    container_name: cert-generator-postgres-fpm
+    command: >
+      sh -c "
+      openssl req -x509 -nodes -days 365 -newkey rsa:2048
+        -keyout /certs/servhostname.local.key
+        -out /certs/servhostname.local.crt
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'
+      && openssl req -new -key /certs/servhostname.local.key
+        -out /certs/servhostname.local.csr
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'"
+    volumes:
+      - certs:/certs
+    restart: "no"
+    networks:
+      - proxy-tier
+
 volumes:
   db:
   nextcloud:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
index 035359f0b..f5b72d121 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
@@ -99,6 +99,25 @@ services:
 #    networks:
 #      - proxy-tier
 
+#Self-signed Certificate Generator (Replaces omgwtfssl)
+  cert-generator:
+    image: frapsoft/openssl
+    container_name: cert-generator-postgres-fpm
+    command: >
+      sh -c "
+      openssl req -x509 -nodes -days 365 -newkey rsa:2048
+        -keyout /certs/servhostname.local.key
+        -out /certs/servhostname.local.crt
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'
+      && openssl req -new -key /certs/servhostname.local.key
+        -out /certs/servhostname.local.csr
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'"
+    volumes:
+      - certs:/certs
+    restart: "no"
+    networks:
+      - proxy-tier
+
 volumes:
   db:
   nextcloud:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml
index 78654edde..6be112338 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml
@@ -115,6 +115,25 @@ services:
 #    networks:
 #      - proxy-tier
 
+#Self-signed Certificate Generator (Replaces omgwtfssl)
+  cert-generator:
+    image: frapsoft/openssl
+    container_name: cert-generator-postgres-fpm
+    command: >
+      sh -c "
+      openssl req -x509 -nodes -days 365 -newkey rsa:2048
+        -keyout /certs/servhostname.local.key
+        -out /certs/servhostname.local.crt
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'
+      && openssl req -new -key /certs/servhostname.local.key
+        -out /certs/servhostname.local.csr
+        -subj '/CN=servhostname.local/O=MyOrg/C=US'"
+    volumes:
+      - certs:/certs
+    restart: "no"
+    networks:
+      - proxy-tier
+
 volumes:
   db:
   nextcloud: