diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java
index cede4c4e9e..6d596eaffd 100644
--- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java
+++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaComputeServiceContextModule.java
@@ -78,7 +78,7 @@ public class CloudSigmaComputeServiceContextModule
 
    @Override
    protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
-      return template.osFamily(OsFamily.UBUNTU).imageNameMatches(".*automated SSH Access.*");
+      return template.osFamily(OsFamily.UBUNTU).imageNameMatches(".*[Aa]utomated SSH Access.*").os64Bit(true);
    }
 
    @SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java b/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java
index 2f144c3a50..d365b692bb 100644
--- a/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java
+++ b/providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java
@@ -53,14 +53,15 @@ public class CloudSigmaLasVegasTemplateBuilderLiveTest extends BaseTemplateBuild
             switch (input.family) {
             case UBUNTU:
                return (input.version.equals("11.04") && input.is64Bit)
-                     || (input.version.equals("10.04") && !input.is64Bit) || input.version.equals("");
+                     || (input.version.equals("11.10") && !input.is64Bit) || input.version.equals("")
+                     || input.version.equals("10.04");
             case SOLARIS:
                return input.version.equals("") && input.is64Bit;
             case DEBIAN:
                return false;
             case CENTOS:
-               return (input.version.equals("") || input.version.equals("6.0"))
-                     || (input.version.matches("5.[57]") && input.is64Bit);
+               return (input.version.equals("") || input.version.equals("5.7") || input.version.equals("6.0"))
+                     && input.is64Bit;
             case WINDOWS:
                return (input.version.equals("2008 R2") || (input.version.equals("2003") || input.version.equals(""))
                      && input.is64Bit)
diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java
index 0e8be6fadd..a46f237689 100644
--- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java
+++ b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java
@@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableSet;
  * 
  * @author Adrian Cole
  */
-@Test(groups = "live", testName = "CloudSigmaZurichTemplateBuilderLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "CloudSigmaZurichTemplateBuilderLiveTest")
 public class CloudSigmaZurichTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
 
    public CloudSigmaZurichTemplateBuilderLiveTest() {
@@ -53,17 +53,15 @@ public class CloudSigmaZurichTemplateBuilderLiveTest extends BaseTemplateBuilder
             switch (input.family) {
             case UBUNTU:
                return input.version.equals("") || input.version.equals("10.04")
-                     || ((input.version.equals("11.04") || input.version.equals("10.10")) && input.is64Bit);
-            case SOLARIS:
-               return input.version.equals("") && input.is64Bit;
+                     || (input.version.equals("10.10") && input.is64Bit)
+                     || (input.version.equals("11.04") && !input.is64Bit);
             case DEBIAN:
-               return input.version.equals("") || input.version.equals("5.0");
+               return (input.version.equals("") || input.version.equals("6.0")) && input.is64Bit;
             case CENTOS:
-               return input.version.equals("") || (input.version.equals("5.7") && input.is64Bit);
+               return (input.version.equals("") || input.version.equals("5.7")) && input.is64Bit;
             case WINDOWS:
-               return input.version.equals("") || input.version.equals("2003")
-                     || (input.version.equals("2008 R2") && input.is64Bit)
-                     || (input.version.equals("2008") && !input.is64Bit);
+               return input.version.equals("") || input.version.matches("200[38]")
+                     || (input.version.equals("2008 R2") && input.is64Bit);
             default:
                return false;
             }
@@ -75,9 +73,9 @@ public class CloudSigmaZurichTemplateBuilderLiveTest extends BaseTemplateBuilder
    @Override
    public void testDefaultTemplateBuilder() throws IOException {
       Template defaultTemplate = context.getComputeService().templateBuilder().build();
-      assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.04");
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "");
       assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
-      assertEquals(defaultTemplate.getImage().getId(), "331f8cff-99c9-4fa9-9069-8f699795ef7e");
+      assertEquals(defaultTemplate.getImage().getId(), "c9df6b90-420c-4c46-b7f2-8d9e99929a09");
       assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
       assertEquals(defaultTemplate.getImage().getDefaultCredentials().identity, "root");
       assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);