diff --git a/src/main/java/org/cloudifysource/quality/iTests/test/cli/cloudify/cloud/azure/AzureUbuntuTest.java b/src/main/java/org/cloudifysource/quality/iTests/test/cli/cloudify/cloud/azure/AzureUbuntuTest.java
new file mode 100644
index 00000000..918223bd
--- /dev/null
+++ b/src/main/java/org/cloudifysource/quality/iTests/test/cli/cloudify/cloud/azure/AzureUbuntuTest.java
@@ -0,0 +1,52 @@
+package org.cloudifysource.quality.iTests.test.cli.cloudify.cloud.azure;
+
+import org.cloudifysource.quality.iTests.framework.utils.CloudBootstrapper;
+import org.cloudifysource.quality.iTests.test.cli.cloudify.cloud.NewAbstractCloudTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: inbarc
+ * CLOUDIFY-1503
+ * Date: 5/28/13
+ * Time: 1:01 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class AzureUbuntuTest extends NewAbstractCloudTest {
+
+    @Test(timeOut = DEFAULT_TEST_TIMEOUT * 5  , enabled = true)
+    protected void bootstrap() throws Exception {
+
+        CloudBootstrapper bootstrapper= new CloudBootstrapper();
+        bootstrapper.timeoutInMinutes(15);
+
+        super.bootstrap(bootstrapper);
+    }
+
+    @AfterClass
+    public void teardown() {
+        try {
+            super.teardown();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected void customizeCloud() throws Exception {
+        super.customizeCloud();
+        getService().getAdditionalPropsToReplace().put("managementMachineTemplate \"SMALL_LINUX\"", "managementMachineTemplate \"UBUNTU\"")  ;
+    }
+
+
+    @Override
+    protected String getCloudName() {
+        return "azure";
+    }
+
+    @Override
+    protected boolean isReusableCloud() {
+        return false;
+    }
+}
diff --git a/src/main/resources/apps/cloudify/cloud/azure/azure-cloud.groovy b/src/main/resources/apps/cloudify/cloud/azure/azure-cloud.groovy
index 81de00cd..44219ba0 100644
--- a/src/main/resources/apps/cloudify/cloud/azure/azure-cloud.groovy
+++ b/src/main/resources/apps/cloudify/cloud/azure/azure-cloud.groovy
@@ -88,7 +88,41 @@ cloud {
 						"azure.pfx.password" : pfxPassword
 					])
 				},
-			
+            UBUNTU : computeTemplate{
+
+
+                imageId "0b11de9248dd4d87b18621318e037d37__RightImage-Ubuntu-12.04-x64-v13.4"
+                machineMemoryMB 1600
+                hardwareId "Small"
+                localDirectory "upload"
+
+                username username
+                password password
+
+                remoteDirectory "/home/${username}/gs-files"
+
+                custom ([
+
+                        // Optional. each availability set represents a different fault domain.
+
+                        "azure.availability.set" : "ENTER_AVAILABILITY_SET",
+
+                        // Choose whether do deploy this instance in Staging or Production environment. defaults to Staging
+
+                        "azure.deployment.slot": "ENTER_DEPLOYMENT_SLOT",
+
+                        /**************************************************************
+                         * Mandatory only for templates used for management machines. *
+                         * Put this file under the path specified in 'localDirectory' *
+                         ***************************************************************/
+
+                        "azure.pfx.file": pfxFile,
+
+                        // Password that was used to create the certificate
+
+                        "azure.pfx.password" : pfxPassword
+                ])
+            },
 				TOMCAT : computeTemplate{