diff --git a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
index a7b49d8..ffb4660 100644
--- a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
+++ b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
@@ -25,8 +25,6 @@ Properties:
   assignFloatingIp:
     Contract: $.bool().notNull()
     Default: true
-  gerritUrl:
-    Contract: $.string().notNull()
 
 Methods:
   .init:
@@ -69,7 +67,6 @@ Methods:
           assignFloatingIp => $.assignFloatingIp)
       - $this.gerrit: new(opaas:Gerrit, $this,
           name => 'Gerrit',
-          warUrl => $.gerritUrl,
           instance => $gerritInstance,
           ldap => $this.ldap)
 
diff --git a/murano-apps/CiCdEnvironment/package/UI/ui.yaml b/murano-apps/CiCdEnvironment/package/UI/ui.yaml
index 397d26d..4639e6a 100644
--- a/murano-apps/CiCdEnvironment/package/UI/ui.yaml
+++ b/murano-apps/CiCdEnvironment/package/UI/ui.yaml
@@ -9,16 +9,9 @@ Application:
   image: $.instanceConfiguration.osImage
   keyname: $.instanceConfiguration.keyPair
   availabilityZone: $.instanceConfiguration.availabilityZone
-  gerritUrl: $.repoConfiguration.gerritUrl
   assignFloatingIp: true
 
 Forms:
-  - repoConfiguration:
-      fields:
-        - name: gerritUrl
-          type: string
-          required: true
-          description: Specify the address to download Gerrit binaries
   - instanceConfiguration:
       fields:
         - name: title
diff --git a/murano-apps/Gerrit/package/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
index c2ac099..b0ce522 100644
--- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml
+++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
@@ -16,7 +16,8 @@ Properties:
   name:
     Contract: $.string().notNull()
   warUrl:
-    Contract: $.string().notNull()
+    Contract: $.string()
+    Default: 'https://goo.gl/aK183z?/gerrit-2.11.8.war'
   ldap:
     Contract: $.class(opaas:OpenLDAP)
 
diff --git a/murano-apps/Gerrit/package/UI/ui.yaml b/murano-apps/Gerrit/package/UI/ui.yaml
index 4143a7e..fc41796 100644
--- a/murano-apps/Gerrit/package/UI/ui.yaml
+++ b/murano-apps/Gerrit/package/UI/ui.yaml
@@ -36,7 +36,7 @@ Forms:
         - name: warUrl
           type: string
           label: URL for war
-          initial: http://gerrit-releases.storage.googleapis.com/gerrit-2.11.2.war
+          initial: 'https://goo.gl/aK183z?/gerrit-2.11.8.war'
           description: >-
             Enter the war version from Gerrit's site
             http://gerrit-releases.storage.googleapis.com/index.html