diff --git a/.github/workflows/ca-container-system-service-test.yml b/.github/workflows/ca-container-system-service-test.yml
index cc895d8ed05..0d562a6d8e1 100644
--- a/.github/workflows/ca-container-system-service-test.yml
+++ b/.github/workflows/ca-container-system-service-test.yml
@@ -79,6 +79,7 @@ jobs:
       - name: Create shared folders in PKI user's home directory
         run: |
           # create folders with default owner and permissions
+          docker exec pki ls -lR /home
           docker exec -u pkiuser pki mkdir /home/pkiuser/certs
           docker exec -u pkiuser pki mkdir /home/pkiuser/conf
           docker exec -u pkiuser pki mkdir /home/pkiuser/logs
diff --git a/.github/workflows/ca-container-user-service-test.yml b/.github/workflows/ca-container-user-service-test.yml
index fa5d0e80fe7..42707d2322e 100644
--- a/.github/workflows/ca-container-user-service-test.yml
+++ b/.github/workflows/ca-container-user-service-test.yml
@@ -81,6 +81,7 @@ jobs:
 
           # use fuse-overlayfs
           # https://github.com/containers/podman/issues/8705#issuecomment-744357805
+          docker exec pki ls -lR /home
           docker exec -u pkiuser pki mkdir -p /home/pkiuser/.config/containers
           docker exec -i -u pkiuser pki tee /home/pkiuser/.config/containers/storage.conf << EOF
           [storage]
diff --git a/Dockerfile b/Dockerfile
index 88da0a058ed..01e1a16e7f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,6 +100,9 @@ RUN dnf install -y /tmp/RPMS/* \
     && rm -rf /var/cache/dnf \
     && rm -rf /tmp/RPMS
 
+# Update home directory owner
+RUN chown -R pkiuser.pkiuser /home/pkiuser
+
 ################################################################################
 FROM pki-runner AS pki-server