diff --git a/resources/saleor/3.0.0-settings.py b/resources/saleor/3.0.0-settings.py
index 361c17b..da0c8ef 100644
--- a/resources/saleor/3.0.0-settings.py
+++ b/resources/saleor/3.0.0-settings.py
@@ -18,6 +18,18 @@ from sentry_sdk.integrations.celery import CeleryIntegration
 from sentry_sdk.integrations.django import DjangoIntegration
 
 
+try:
+    from decouple import RepositoryEnv
+    file_path = os.path.normpath(os.path.join(os.path.dirname(__file__), ".."))
+    #print("{}/.env".format(file_path))
+    for k,v in RepositoryEnv("{}/.env".format(file_path)).data.items():
+        print(k, v)
+        os.environ[k] = v
+except Exception as e:
+    #print(e)
+    pass
+
+
 def get_list(text):
     return [item.strip() for item in text.split(",")]
 
diff --git a/template.undeploy b/template.undeploy
index 266b239..c1a8316 100644
--- a/template.undeploy
+++ b/template.undeploy
@@ -76,6 +76,7 @@ while [ -n "$1" ]; do # while loop starts
         -g)
             if [ "$2" = "" ]; then
                 GRD="yes"
+                print_status "Graceful database removal selected."
             else
                 GRD="$2"
             fi