diff --git a/.gitmodules b/.gitmodules
index 3677791776406d71ac051565ec837c711a5f0eba..c5e3bbddf36f452868cfd40dae60f5528deaaf0e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,11 @@
 [submodule "implementations/ocm"]
 	path = implementations/ocm
-	url = git@gitlab.eclipse.org:eclipse/xfsc/ocm/bdd.git
+	url = https://gitlab.eclipse.org:eclipse/xfsc/ocm/bdd.git
 	branch = ocm-1-bdd-framework-migrate-train-bdd-testkit-2
 [submodule "implementations/ocm-w"]
 	path = implementations/ocm-w
-	url = git@gitlab.eclipse.org:eclipse/xfsc/organisational-credential-manager-w-stack/bdd.git
+	url = https://gitlab.eclipse.org:eclipse/xfsc/organisational-credential-manager-w-stack/bdd.git
 [submodule "implementations/train"]
 	path = implementations/train
-	url = git@gitlab.eclipse.org:eclipse/xfsc/train/BDD.git
+	url = https://gitlab.eclipse.org/eclipse/xfsc/train/BDD.git
+	branch = main
diff --git a/src/eu/xfsc/bdd/core/environment.py b/src/eu/xfsc/bdd/core/environment.py
index 6440c3697086952b3054cd04e4ced82e28eac589..38318e78a9a4c9f25f7a0a3df5f2581bd4366f81 100644
--- a/src/eu/xfsc/bdd/core/environment.py
+++ b/src/eu/xfsc/bdd/core/environment.py
@@ -1 +1,4 @@
 # see https://behave.readthedocs.io/en/stable/tutorial.html#environmental-controls
+PROD = 'PROD'
+STAGING = 'STAGING'
+