diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed070e970d10fef49e6718ed3a81de01aff3bb98..fdc55a87b8bbec32f5922ee25408ce409e85f1a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ buildgui:
     - ./gitinfo.sh
     - ls -la src/gitinfo.json
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de
-    - docker build -t $FRONTEND_TEST_IMAGE --build-arg public_url=http://example.com/nomad/$CI_COMMIT_REF_NAME .
+    - docker build -t $FRONTEND_TEST_IMAGE
     - docker push $FRONTEND_TEST_IMAGE
   except:
     - /^dev-.*$/
diff --git a/gui/Dockerfile b/gui/Dockerfile
index 2ac26fd119bf4c4c78f97d6ef2f3fd529b697c2c..6c6d207a991390f13e6c603ad410e8534928e057 100644
--- a/gui/Dockerfile
+++ b/gui/Dockerfile
@@ -28,8 +28,6 @@ COPY yarn.lock /nomad/app/yarn.lock
 RUN yarn
 COPY . /nomad/app
 
-ARG public_url=http://example.com/nomad
-ENV PUBLIC_URL $public_url
 RUN yarn run build
 
 # production environment
diff --git a/gui/package.json b/gui/package.json
index 9ca5bca0291ab111c437b1a8117ef780f6ea5744..1e46c1cda78c745da58f541a7975f1afa5091395 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -40,5 +40,5 @@
     "eslint-plugin-standard": "^3.1.0",
     "serve": "^10.0.0"
   },
-  "homepage": "http://mywebsite.com/nomad"
+  "homepage": "."
 }
diff --git a/ops/helm/nomad/templates/api-deployment.yaml b/ops/helm/nomad/templates/api-deployment.yaml
index 4a521b5a499ce4c9e599ad5401a3abada452cde8..1475fdafa7f3a69d6dfeff07d759af40cb2ef029 100644
--- a/ops/helm/nomad/templates/api-deployment.yaml
+++ b/ops/helm/nomad/templates/api-deployment.yaml
@@ -53,19 +53,19 @@ spec:
         - name: NOMAD_ELASTIC_PORT
           value: "{{ .Values.elastic.port }}"
         - name: NOMAD_ELASTIC_INDEX_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_MONGO_HOST
           value: "{{ .Values.mongo.host }}"
         - name: NOMAD_MONGO_PORT
           value: "{{ .Values.mongo.port }}"
         - name: NOMAD_MONGO_DB_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_COE_REPO_DB_HOST
           value: "{{ .Values.postgres.host }}"
         - name: NOMAD_COE_REPO_DB_PORT
           value: "{{ .Values.postgres.port }}"
         - name: NOMAD_COE_REPO_DB_NAME
-          value: "{{ .Release.Name }}_nomad"
+          value: "{{ .Values.dbname }}"
         command: ["python", "-m", "gunicorn.app.wsgiapp", "-b 0.0.0.0:8000", "nomad.api:app"]
       imagePullSecrets:
       - name: {{ .Values.images.secret }}
diff --git a/ops/helm/nomad/templates/worker-deployment.yaml b/ops/helm/nomad/templates/worker-deployment.yaml
index 1c4ea159bc6a76c1a571b79ebba3f60105a9b1b5..f425c1f024b530ee15dd644ef14dea941201f4f0 100644
--- a/ops/helm/nomad/templates/worker-deployment.yaml
+++ b/ops/helm/nomad/templates/worker-deployment.yaml
@@ -45,19 +45,19 @@ spec:
         - name: NOMAD_ELASTIC_PORT
           value: "{{ .Values.elastic.port }}"
         - name: NOMAD_ELASTIC_INDEX_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_MONGO_HOST
           value: "{{ .Values.mongo.host }}"
         - name: NOMAD_MONGO_PORT
           value: "{{ .Values.mongo.port }}"
         - name: NOMAD_MONGO_DB_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_COE_REPO_DB_HOST
           value: "{{ .Values.postgres.host }}"
         - name: NOMAD_COE_REPO_DB_PORT
           value: "{{ .Values.postgres.port }}"
         - name: NOMAD_COE_REPO_DB_NAME
-          value: "{{ .Release.Name }}_nomad"
+          value: "{{ .Values.dbname }}"
         command: ["python", "-m", "celery", "worker", "-l", "info", "-A", "nomad.processing"]
       imagePullSecrets:
       - name: {{ .Values.images.secret }}
diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml
index ed5b6dd19ef207092fa9fdbdb8404cd057070750..95f70a96d5ae3b8f8dc4e905a18ec55c27a8818e 100644
--- a/ops/helm/nomad/values.yaml
+++ b/ops/helm/nomad/values.yaml
@@ -65,6 +65,9 @@ rabbitmq:
     password: rabbitmq
     erlangCookie: SWQOKODSQALRPCLNMEQG
 
+## A common name/prefix for all dbs and indices.
+dbname: nomad_kubetest
+
 ## Databases that are not run within the cluster.
 #  To run databases in the cluster, use the nomad-full helm chart.
 mongo: