Improved naming

.gitlab-ci.yml

@@ -16,7 +16,17 @@ kibana:
   - helm repo add elastic https://helm.elastic.co
   - helm install kibana elastic/kibana --set elasticsearchHosts=$ES_HOST || true
 
-hiphop-container:
+secrets:
+  stage: prepare
+  script:
+    - kubectl delete secret gitlab-registry-credentials || true
+    - "kubectl create secret docker-registry gitlab-registry-credentials \
+          --docker-server=$CI_REGISTRY \
+          --docker-username=image-registry \ 
+          --docker-password=$REGISTRY_READ_TOKEN \ 
+          "
+
+hiphop:
   stage: build
   image:
       name: gcr.io/kaniko-project/executor:debug
@@ -32,7 +42,7 @@ hiphop-container:
       - cd hiphop
       - /kaniko/executor --context . --destination $CI_REGISTRY_IMAGE/hiphop:latest
 
-space-container:
+space:
   stage: build
   image:
       name: gcr.io/kaniko-project/executor:debug
@@ -48,17 +58,7 @@ space-container:
       - cd space
       - /kaniko/executor --context . --destination $CI_REGISTRY_IMAGE/space:latest
 
-secrets:
-  stage: build
-  script:
-    - kubectl delete secret gitlab-registry-credentials || true
-    - "kubectl create secret docker-registry gitlab-registry-credentials \
-          --docker-server=$CI_REGISTRY \
-          --docker-username=image-registry \ 
-          --docker-password=$REGISTRY_READ_TOKEN \ 
-          "
-
-space:
+space-svc:
   stage: deploy
   when: manual
   script:
@@ -67,7 +67,7 @@ space:
     - kubectl delete -f deploy/space-deploy+svc.yaml || true
     - kubectl apply -f deploy/space-deploy+svc.yaml
 
-hiphop:
+hiphop-svc:
   stage: deploy
   when: manual
   script: