diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b6dc21eecb64654c032c8f92e4731c2e339a97b..372cb03e5c67ddb4aaa83364f2615a097706ee75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -210,7 +210,6 @@ behave-integration:
     SECRET: "secret"
   image: ${CI_REGISTRY_IMAGE}/behave:${CI_COMMIT_REF_NAME}
   script:
-    - sleep 30
     - curl http://hydra:4445/health/alive
     - curl http://kratos:4433/health/alive
     - curl http://oidc:5000/status
diff --git a/hydra/Dockerfile b/hydra/Dockerfile
index dd2862f0ef19d20da82f3ab066b88726a6e135f6..79d7efb9d59220f217601938dc6664f4fe306371 100644
--- a/hydra/Dockerfile
+++ b/hydra/Dockerfile
@@ -3,12 +3,10 @@
 
 # This Dockerfile is only used for testing CI/CD testing and is not used in
 # production.
-
-
 FROM oryd/hydra:latest
 
+# Set DSN in Dockerfile, as services variables in CI/CD testing as shared
+# between services and the DSN is different for different services.
 ENV DSN="postgres://hydra:hydra@postgres/hydra"
 
-#COPY identity.default.schema.json /etc/config/identity.default.schema.json
-#COPY kratos.yaml /etc/config/kratos.yaml
 
diff --git a/kratos/Dockerfile b/kratos/Dockerfile
index cd2af48bde47c271f2174cda8c3f15a455fad781..9ce79d0c05a349bc52c2268f8fc7ed1677fdefed 100644
--- a/kratos/Dockerfile
+++ b/kratos/Dockerfile
@@ -3,12 +3,13 @@
 
 # This Dockerfile is only used for testing CI/CD testing and is not used in
 # production.
-
-
 FROM oryd/kratos:latest-sqlite
 
+# Set DSN in Dockerfile, as services variables in CI/CD testing as shared
+# between services and the DSN is different for different services.
 ENV DSN="postgres://kratos:kratos@postgres/kratos"
 
+# Copy testing schema and config into image
 COPY identity.default.schema.json /etc/config/identity.default.schema.json
 COPY kratos.yaml /etc/config/kratos.yaml
 
diff --git a/login/app.py b/login/app.py
index bcee97f888e9f8b6f932d46e2a063db318aa5135..68f45284d6b0329f74c8fd89af3bdab73d145396 100644
--- a/login/app.py
+++ b/login/app.py
@@ -34,8 +34,6 @@ from ory_kratos_client.model.admin_create_self_service_recovery_link_body import
 from ory_kratos_client.model.identity_state import IdentityState
 
 
-print(os.environ)
-
 # Initaliaze the FLASK app
 app = Flask(__name__,
              static_url_path='/static')
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 5bb1e5c86009ab16a1df50754852f4d02cbfed8e..3f567afad9a68c926a9f6df24461485f43f59f4b 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -4,10 +4,8 @@
 # This Dockerfile is only used for testing CI/CD testing and is not used in
 # production.
 
-
-
 FROM postgres:latest
 
-
+# Copy our setup SQL to the image to create databases at setup/first run
 COPY setup.sql /docker-entrypoint-initdb.d/setup.sql