diff --git a/wordpress-volumes/wordpress-web.yml b/wordpress-volumes/wordpress-web.yml
index 8f8023c..fa699e2 100644
--- a/wordpress-volumes/wordpress-web.yml
+++ b/wordpress-volumes/wordpress-web.yml
@@ -14,13 +14,17 @@ spec:
     spec:
       containers:
       - name: wordpress
-        image: wordpress:4-php7.0
+        image: wordpress:6-php8.0
         # uncomment to fix perm issue, see also https://github.com/kubernetes/kubernetes/issues/2630
         # command: ['bash', '-c', 'mkdir -p /var/www/html/wp-content/uploads; chown www-data:www-data /var/www/html/wp-content/uploads && docker-entrypoint.sh apache2-foreground']
         ports:
         - name: http-port
           containerPort: 80
         env:
+          - name: WORDPRESS_DB_USER
+            value: root
+          - name: WORDPRESS_DB_NAME
+            value: wordpress
           - name: WORDPRESS_DB_PASSWORD
             valueFrom:
               secretKeyRef:
@@ -68,11 +72,11 @@ spec:
                 key: noncesalt
           - name: WORDPRESS_DB_HOST
             value: wordpress-db
-        volumeMounts:
-        - mountPath: /var/www/html/wp-content/uploads
-          name: uploads
-      volumes:
-      - name: uploads
-        nfs:
-          server: eu-west-1a.fs-5714e89e.efs.eu-west-1.amazonaws.com
-          path: /
+              #  volumeMounts:
+              #  - mountPath: /var/www/html/wp-content/uploads
+              #    name: uploads
+              #volumes:
+              #- name: uploads
+              #  nfs:
+              #    server: eu-west-1a.fs-5714e89e.efs.eu-west-1.amazonaws.com
+              #    path: /
diff --git a/wordpress/wordpress-single-deployment-no-volumes.yml b/wordpress/wordpress-single-deployment-no-volumes.yml
index a3a7450..e4a5fff 100644
--- a/wordpress/wordpress-single-deployment-no-volumes.yml
+++ b/wordpress/wordpress-single-deployment-no-volumes.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: wordpress
-        image: wordpress:4-php7.0
+        image: wordpress:6-php8.0
         ports:
         - name: http-port
           containerPort: 80
@@ -26,12 +26,18 @@ spec:
                 key: db-password
           - name: WORDPRESS_DB_HOST
             value: 127.0.0.1
+          - name: WORDPRESS_DB_USER
+            value: root
+          - name: WORDPRESS_DB_NAME
+            value: wordpress
       - name: mysql
         image: mysql:8
         ports:
         - name: mysql-port
           containerPort: 3306
         env:
+          - name: MYSQL_DATABASE
+            value: wordpress
           - name: MYSQL_ROOT_PASSWORD
             valueFrom:
               secretKeyRef: