diff --git a/.github/workflows/build_deploy_staging.yml b/.github/workflows/build_deploy_staging.yml
index 5ca406f50..e339353f2 100644
--- a/.github/workflows/build_deploy_staging.yml
+++ b/.github/workflows/build_deploy_staging.yml
@@ -164,7 +164,7 @@ jobs:
           export KUBECONFIG=./kubeconfig
           helm repo add eisrepo https://internetee.github.io/helm-charts/
           helm repo update
-          helm upgrade --install reg-admin-"$PR_REF" --set image.tag="$SHORT_TAG",reference="$PR_REF" eisrepo/registry-admin -n reg-admin-staging
+          helm upgrade --install reg-admin-"$PR_REF" --set image.tag="$SHORT_TAG",reference="$PR_REF" eisrepo/registry-admin -n reg-admin
           helm upgrade --install epp-"$PR_REF" --set image.tag="$SHORT_TAG",reference="$PR_REF",epp.proxy.enabled=true eisrepo/registry-epp -n epp
           helm upgrade --install reg-api-"$PR_REF" --set image.tag="$SHORT_TAG",reference="$PR_REF" eisrepo/registry-api -n reg-api
           TOKEN=${{ secrets.CLOUD_TOKEN }} python3 ../../portOpener.py "$PR_REF" add
diff --git a/Dockerfile.generic b/Dockerfile.generic
index 0ed978f05..32520834b 100644
--- a/Dockerfile.generic
+++ b/Dockerfile.generic
@@ -9,7 +9,13 @@ ENV SECRET_KEY_BASE "$SECRET_KEY_BASE"
 
 RUN npm install -g yarn@"$YARN_VER"
 
-RUN mkdir -p /opt/webapps/app/tmp/pids
+RUN mkdir -p -v -m776 {/opt/webapps/app/tmp/pids,/opt/ca,/opt/ca/newcerts}
+RUN echo -n 12 > /opt/ca/serial 
+RUN chmod 776 /opt/ca/serial
+RUN echo '3A0e' > /opt/ca/crlnumber
+RUN chmod 776 /opt/ca/crlnumber
+RUN touch /opt/ca/index.txt
+RUN chmod 776 /opt/ca/index.txt
 WORKDIR /opt/webapps/app
 COPY Gemfile Gemfile.lock ./
 RUN gem install bundler && bundle config set without 'development test' && bundle install --jobs 20 --retry 5
diff --git a/Dockerfile.preinstalled_gems b/Dockerfile.preinstalled_gems
index ad36b6cb3..81ec98624 100644
--- a/Dockerfile.preinstalled_gems
+++ b/Dockerfile.preinstalled_gems
@@ -9,7 +9,14 @@ ENV SECRET_KEY_BASE "$SECRET_KEY_BASE"
 
 RUN npm install -g yarn@"$YARN_VER"
 
-RUN mkdir -p /opt/webapps/app/tmp/pids
+RUN mkdir -p -m776 /opt/webapps/app/tmp/pids
+RUN mkdir -p -m776 /opt/ca/newcerts
+RUN echo -n 12 > /opt/ca/serial 
+RUN chmod 776 /opt/ca/serial
+RUN echo '3A0e' > /opt/ca/crlnumber
+RUN chmod 776 /opt/ca/crlnumber
+RUN touch /opt/ca/index.txt
+RUN chmod 776 /opt/ca/index.txt
 WORKDIR /opt/webapps/app
 
 COPY . .