diff --git a/Dockerfile-template b/Dockerfile
similarity index 100%
rename from Dockerfile-template
rename to Dockerfile
diff --git a/charts/eric-oss-hello-world-python-app/Chart.yaml b/charts/eric-oss-hello-world-python-app/Chart.yaml
index 3d3023d..2f6aa4f 100644
--- a/charts/eric-oss-hello-world-python-app/Chart.yaml
+++ b/charts/eric-oss-hello-world-python-app/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "2.0.0"
 description: IDUN SDK Hello World App
 name: eric-oss-hello-world-python-app
 type: application
-version: 2.1.0-0
+version: VERSION
diff --git a/charts/eric-oss-hello-world-python-app/eric-product-info.yaml b/charts/eric-oss-hello-world-python-app/eric-product-info.yaml
index 21c2b0b..ecd4eb7 100644
--- a/charts/eric-oss-hello-world-python-app/eric-product-info.yaml
+++ b/charts/eric-oss-hello-world-python-app/eric-product-info.yaml
@@ -5,6 +5,6 @@ images:
     productName: "Python hello world sample app image"
     productNumber: ""
     registry: "armdocker.rnd.ericsson.se"
-    repoPath: "proj-eric-oss-drop"
+    repoPath: "REPO_PATH"
     name: "eric-oss-hello-world-python-app"
-    tag: "2.1.0-0"
+    tag: "VERSION"
diff --git a/csar/Definitions/AppDescriptor.yaml b/csar/Definitions/AppDescriptor.yaml
index 65388b8..0fb0a96 100644
--- a/csar/Definitions/AppDescriptor.yaml
+++ b/csar/Definitions/AppDescriptor.yaml
@@ -1,10 +1,10 @@
 #tosca_definitions_version: Metadata/Tosca.meta
 Description of an APP:
     APPName: eric-oss-hello-world-python-app
-    APPVersion: 2.1.0-0
+    APPVersion: VERSION
     APPType: rApp
 APPComponent:
     NameofComponent: eric-oss-hello-world-python-app
-    Version: 2.1.0-0
+    Version: VERSION
     Path: OtherDefinitions/ASD/eric-oss-hello-world-python-appASD.yaml
     ArtefactType: Microservice
diff --git a/csar/OtherDefinitions/ASD/eric-oss-hello-world-python-appASD.yaml b/csar/OtherDefinitions/ASD/eric-oss-hello-world-python-appASD.yaml
index 5529f89..c570dd0 100644
--- a/csar/OtherDefinitions/ASD/eric-oss-hello-world-python-appASD.yaml
+++ b/csar/OtherDefinitions/ASD/eric-oss-hello-world-python-appASD.yaml
@@ -2,9 +2,9 @@ asdId: 1
 asdSchemaVersion: 1.0.0
 asdProvider: Ericsson
 asdApplicationName: eric-oss-hello-world-python-app
-asdApplicationVersion: 2.1.0-0
+asdApplicationVersion: VERSION
 asdApplicationInfoName: Hello World Python Application
 asdInfoDescription: Hello World Python application for App Onboarding
 deploymentItems:
     deploymentItemId: 1
-    artifactId: OtherDefinitions/ASD/eric-oss-hello-world-python-app-2.1.0-0.tgz
\ No newline at end of file
+    artifactId: OtherDefinitions/ASD/eric-oss-hello-world-python-app-VERSION.tgz
\ No newline at end of file