diff --git a/cli/internal/cloudcmd/apply_test.go b/cli/internal/cloudcmd/apply_test.go
index 3375d5a2f..47217362f 100644
--- a/cli/internal/cloudcmd/apply_test.go
+++ b/cli/internal/cloudcmd/apply_test.go
@@ -27,7 +27,6 @@ import (
 )
 
 func TestApplier(t *testing.T) {
-	t.Setenv("CONSTELLATION_OPENSTACK_DEV", "1")
 	failOnNonAMD64 := (runtime.GOARCH != "amd64") || (runtime.GOOS != "linux")
 	ip := "192.0.2.1"
 	configWithProvider := func(provider cloudprovider.Provider) *config.Config {
diff --git a/cli/internal/cloudcmd/tfvars.go b/cli/internal/cloudcmd/tfvars.go
index 224cb8f77..9a9062b94 100644
--- a/cli/internal/cloudcmd/tfvars.go
+++ b/cli/internal/cloudcmd/tfvars.go
@@ -234,9 +234,6 @@ func gcpTerraformIAMVars(conf *config.Config, oldVars terraform.GCPIAMVariables)
 // openStackTerraformVars provides variables required to execute the Terraform scripts.
 // It should be the only place to declare the OpenStack variables.
 func openStackTerraformVars(conf *config.Config, imageRef string) (*terraform.OpenStackClusterVariables, error) {
-	if os.Getenv("CONSTELLATION_OPENSTACK_DEV") != "1" {
-		return nil, errors.New("Constellation must be fine-tuned to your OpenStack deployment. Please create an issue or contact Edgeless Systems at https://edgeless.systems/contact/")
-	}
 	if _, hasOSAuthURL := os.LookupEnv("OS_AUTH_URL"); !hasOSAuthURL && conf.Provider.OpenStack.Cloud == "" {
 		return nil, errors.New(
 			"neither environment variable OS_AUTH_URL nor cloud name for \"clouds.yaml\" is set. OpenStack authentication requires a set of " +
diff --git a/image/system/variants.bzl b/image/system/variants.bzl
index 5465d4f45..75dd7c21e 100644
--- a/image/system/variants.bzl
+++ b/image/system/variants.bzl
@@ -73,7 +73,6 @@ csp_settings = {
         },
     },
     "openstack": {
-        "autologin": True,
         "kernel_command_line": "console=tty0 console=ttyS0",
         "kernel_command_line_dict": {
             "console": "tty0",