diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ba694fe0065ff573145b4d926b3f24710e101c4..d4e8a0fa28715fd19b3e37359a9bf2228b6b9d17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,10 +108,6 @@ behave-integration:
   services:
     - name: postgres:latest
       alias: postgres
-      variables:
-        POSTGRES_PASSWORD: postgres
-        POSTGRES_USER: postgres
-        POSTGRES_DB: postgres
     - name: ${CI_REGISTRY_IMAGE}/kratos:${CI_COMMIT_REF_NAME}
       alias: kratos
       command:
@@ -126,35 +122,35 @@ behave-integration:
         - --dangerous-force-http
         - --dangerous-allow-insecure-redirect-urls
         - http://oidc:5000/login
-      variables:
-        DSN: memory
-        URLS_SELF_ISSUER: http://localhost/
-        URLS_CONSENT: http://oidc:5000/login
-        URLS_LOGIN: http://oidc:5000/consent
     - name: ${CI_REGISTRY_IMAGE}/login:${CI_COMMIT_REF_NAME}
       alias: oidc
-      variables:
-        OIDC_ONLY: "OIDCONLY"
-        PAUBLIC_URL: "http://localhost:5001/"
-        DATABASE_URL: "postgresql://postgres:postgres@postgres/postgres"
   variables:
     # Feature Flag FF_NETWORK_PER_BUILD Enables creation of a docker network per build
     # with the docker executor of the gitlab-runner. This is required for service
     # interconnection. Requires gitlab-runner v12.9.0
     FF_NETWORK_PER_BUILD: 1
-    DATABASE_HOST: "postgres"
     # For login panel
     FLASK_RUN_HOST: "0.0.0.0"
     FLASK_RUN_PORT: "5000"
     HYDRA_ADMIN_URL: "http://hydra:4445"
     KRATOS_PUBLIC_URL: "http://kratos:4433"
     KRATOS_ADMIN_URL: "http://kratos:4434"
-    PAUBLIC_URL: "http://localhost:5000/"
+    PUBLIC_URL: "http://localhost:5000/"
     DATABASE_URL: "postgresql://postgres:postgres@postgres/postgres"
-#    URLS_LOGIN: "http://login:5000/login"
-#    URLS_LOGOUT: "http://logout:5002/logout"
-#    URLS_CONSENT: "http://consent:5001/consent"
-#    URLS_SELF_ISSUER: "http://hydra:4444/"
+    # For hydra & kratos
+    DSN: memory
+    # For hydra
+    URLS_SELF_ISSUER: http://localhost/
+    URLS_CONSENT: http://oidc:5000/login
+    URLS_LOGIN: http://oidc:5000/consent
+    # For postgres image
+    POSTGRES_PASSWORD: secret
+    POSTGRES_USER: postgres
+    POSTGRES_DB: postgres
+    # General flask
+    DEBUG: "true"
+    FLASK_ENV: "development"
+    # Others and old
     BASE_URL: "http://hydra:4444/"
     HYDRA_ADMIN_URL: "http://hydra:4445"
     ACCESS_TOKEN_URL: "http://hydra:4444/oauth2/token"
@@ -170,17 +166,14 @@ behave-integration:
     ROLE: "admin"
     DSN: "memory"
     SECRETS_SYSTEM: "youReallyNeedToChangeThis"
+    DATABASE_HOST: "postgres"
     DATABASE_USER: postgres
     DATABASE_PASSWORD: secret
     DATABASE_NAME: postgres
-    POSTGRES_PASSWORD: secret
-    POSTGRES_USER: postgres
-    POSTGRES_DB: postgres
+    # General
     OAUTHLIB_INSECURE_TRANSPORT: "true"
     KEY: "testapp"
     SECRET: "secret"
-    DEBUG: "true"
-    FLASK_ENV: "development"
   image: ${CI_REGISTRY_IMAGE}/login:${CI_COMMIT_REF_NAME}
   script:
     - echo "I am skipped today!"