diff --git a/.env.dev b/.env.dev
index 3f0bf936..6ae5db34 100644
--- a/.env.dev
+++ b/.env.dev
@@ -146,7 +146,7 @@ REDIS_URL="localhost:6379"
 #
 RETENTION_MINIMUM_GLACIER=90
 RETENTION_MINIMUM_GLACIER_DEEP=180
-RETENTION_MINIMUM_WASABI=90
+RETENTION_MINIMUM_NEWSTORAGEOPTION=90
 RETENTION_MINIMUM_STANDARD=0
 
 #
diff --git a/.env.docker b/.env.docker
index 12deb36c..b525cc6c 100644
--- a/.env.docker
+++ b/.env.docker
@@ -50,7 +50,7 @@
 # REDIS_URL
 # RETENTION_MINIMUM_GLACIER
 # RETENTION_MINIMUM_GLACIER_DEEP
-# RETENTION_MINIMUM_WASABI
+# RETENTION_MINIMUM_NEWSTORAGEOPTION
 # RETENTION_MINIMUM_STANDARD
 # SESSION_COOKIE_NAME
 # SESSION_MAX_AGE
diff --git a/.env.integration b/.env.integration
index f6b9a628..ebde1c7e 100644
--- a/.env.integration
+++ b/.env.integration
@@ -147,7 +147,7 @@ REDIS_URL="localhost:6379"
 #
 RETENTION_MINIMUM_GLACIER=90
 RETENTION_MINIMUM_GLACIER_DEEP=180
-RETENTION_MINIMUM_WASABI=90
+RETENTION_MINIMUM_NEWSTORAGEOPTION=90
 RETENTION_MINIMUM_STANDARD=0
 
 
diff --git a/.env.test b/.env.test
index 982eea56..7df947b0 100644
--- a/.env.test
+++ b/.env.test
@@ -148,7 +148,7 @@ REDIS_URL="localhost:6379"
 #
 RETENTION_MINIMUM_GLACIER=90
 RETENTION_MINIMUM_GLACIER_DEEP=180
-RETENTION_MINIMUM_WASABI=90
+RETENTION_MINIMUM_NEWSTORAGEOPTION=90
 RETENTION_MINIMUM_STANDARD=0
 
 
diff --git a/.env.travis b/.env.travis
index 0dd7013f..ff5feacb 100644
--- a/.env.travis
+++ b/.env.travis
@@ -147,7 +147,7 @@ REDIS_URL="localhost:6379"
 #
 RETENTION_MINIMUM_GLACIER=90
 RETENTION_MINIMUM_GLACIER_DEEP=180
-RETENTION_MINIMUM_WASABI=90
+RETENTION_MINIMUM_NEWSTORAGEOPTION=90
 RETENTION_MINIMUM_STANDARD=0
 
 #
diff --git a/Dockerfile.multi b/Dockerfile.multi
index 64c601c9..03c5370d 100644
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -93,7 +93,7 @@ ENV AWS_SNS_PWD=password
 #Storage retention periods.
 ENV RETENTION_MINIMUM_GLACIER=0
 ENV RETENTION_MINIMUM_GLACIER_DEEP=0
-ENV RETENTION_MINIMUM_WASABI=0
+ENV RETENTION_MINIMUM_NEWSTORAGEOPTION=0
 ENV RETENTION_MINIMUM_STANDARD=0
 # Making a note for a new dockerfile test.
 EXPOSE 8080
diff --git a/cfn/cfn-registry-cluster.tmpl b/cfn/cfn-registry-cluster.tmpl
index 3b7d0d96..24e5d921 100644
--- a/cfn/cfn-registry-cluster.tmpl
+++ b/cfn/cfn-registry-cluster.tmpl
@@ -292,8 +292,8 @@ Resources:
           ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER'
         - Name: RETENTION_MINIMUM_GLACIER_DEEP
           ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP'
-        - Name: RETENTION_MINIMUM_WASABI
-          ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI'
+        - Name: RETENTION_MINIMUM_NEWSTORAGEOPTION
+          ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_NEWSTORAGEOPTION'
         - Name: RETENTION_MINIMUM_STANDARD
           ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD'
         - Name: AWS_SNS_USER
diff --git a/cfn/cfn-registry-cluster.yml b/cfn/cfn-registry-cluster.yml
index 6ec3ea95..df89da8a 100644
--- a/cfn/cfn-registry-cluster.yml
+++ b/cfn/cfn-registry-cluster.yml
@@ -292,8 +292,8 @@ Resources:
           ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER'
         - Name: RETENTION_MINIMUM_GLACIER_DEEP
           ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP'
-        - Name: RETENTION_MINIMUM_WASABI
-          ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI'
+        - Name: RETENTION_MINIMUM_NEWSTORAGEOPTION
+          ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_NEWSTORAGEOPTION'
         - Name: RETENTION_MINIMUM_STANDARD
           ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD'
         - Name: AWS_SNS_USER
diff --git a/common/config.go b/common/config.go
index ccdbb71c..a60908f7 100644
--- a/common/config.go
+++ b/common/config.go
@@ -301,7 +301,7 @@ func loadConfig() *Config {
 		RetentionMinimum: &RetentionMinimum{
 			Glacier:     v.GetInt("RETENTION_MINIMUM_GLACIER"),
 			GlacierDeep: v.GetInt("RETENTION_MINIMUM_GLACIER_DEEP"),
-			Wasabi:      v.GetInt("RETENTION_MINIMUM_WASABI"),
+			Wasabi:      v.GetInt("RETENTION_MINIMUM_NEWSTORAGEOPTION"),
 			Standard:    v.GetInt("RETENTION_MINIMUM_STANDARD"),
 		},
 	}