diff --git a/.idea/modules/plugins-cloud.iml b/.idea/modules/plugins-cloud.iml
index b743ca0ec5a..d49330881c1 100644
--- a/.idea/modules/plugins-cloud.iml
+++ b/.idea/modules/plugins-cloud.iml
@@ -16,12 +16,6 @@
       <library name="jclouds">
         <CLASSES>
           <root url="jar://$GRADLE_REPOSITORY$/com.google.code.gson/gson/jars/gson-1.4.jar!/" />
-          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-rackspace/jars/jclouds-rackspace-1.0-SNAPSHOT.jar!/" />
-          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-compute/jars/jclouds-compute-1.0-SNAPSHOT.jar!/" />
-          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-blobstore/jars/jclouds-blobstore-1.0-SNAPSHOT.jar!/" />
-          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-scriptbuilder/jars/jclouds-scriptbuilder-1.0-SNAPSHOT.jar!/" />
-          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-core/jars/jclouds-core-1.0-SNAPSHOT.jar!/" />
-          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-aws/jars/jclouds-aws-1.0-SNAPSHOT.jar!/" />
           <root url="jar://$GRADLE_REPOSITORY$/com.jamesmurty.utils/java-xmlbuilder/jars/java-xmlbuilder-0.3.jar!/" />
           <root url="jar://$GRADLE_REPOSITORY$/javax.annotation/jsr250-api/jars/jsr250-api-1.0.jar!/" />
           <root url="jar://$GRADLE_REPOSITORY$/javax.inject/inject/jars/inject-1.0.jar!/" />
@@ -35,6 +29,21 @@
           <root url="jar://$GRADLE_REPOSITORY$/com.google.guava/guava-base/jars/guava-base-r03.jar!/" />
           <root url="jar://$GRADLE_REPOSITORY$/com.google.guava/guava-collections/jars/guava-collections-r03.jar!/" />
           <root url="jar://$GRADLE_REPOSITORY$/com.google.code.guice/guice/jars/guice-2.1-r1128.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-compute/jars/jclouds-compute-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-bluelock/jars/jclouds-bluelock-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-core/jars/jclouds-core-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-aws/jars/jclouds-aws-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-terremark/jars/jclouds-terremark-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-gogrid/jars/jclouds-gogrid-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-atmos/jars/jclouds-atmos-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-jsch/jars/jclouds-jsch-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-blobstore/jars/jclouds-blobstore-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-hostingdotcom/jars/jclouds-hostingdotcom-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-azure/jars/jclouds-azure-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-rimuhosting/jars/jclouds-rimuhosting-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-scriptbuilder/jars/jclouds-scriptbuilder-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-vcloud/jars/jclouds-vcloud-1.0-beta-5.jar!/" />
+          <root url="jar://$GRADLE_REPOSITORY$/org.jclouds/jclouds-rackspace/jars/jclouds-rackspace-1.0-beta-5.jar!/" />
         </CLASSES>
         <JAVADOC>
           <root url="http://jclouds.rimuhosting.com/apidocs/" />
diff --git a/plugins/cloud/build.gradle b/plugins/cloud/build.gradle
index a7179657dd9..ca72e147366 100644
--- a/plugins/cloud/build.gradle
+++ b/plugins/cloud/build.gradle
@@ -34,7 +34,7 @@ repositories {
     mavenRepo urls: "http://java-xmlbuilder.googlecode.com/svn/repo"
 }
 
-jcloudsVersion = "1.0-SNAPSHOT"
+jcloudsVersion = "1.0-beta-5"
 
 dependencies {
     compile project(':elasticsearch')
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudZenPing.java b/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudZenPing.java
index 4e1f24f01be..55cda6adf32 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudZenPing.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/discovery/cloud/CloudZenPing.java
@@ -38,7 +38,7 @@ import org.jclouds.domain.Location;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 
 import static org.elasticsearch.util.collect.Lists.*;
 
@@ -68,10 +68,10 @@ public class CloudZenPing extends UnicastZenPing {
 
     @Override protected List<DiscoveryNode> buildDynamicNodes() {
         List<DiscoveryNode> discoNodes = newArrayList();
-        Map<String, ? extends ComputeMetadata> nodes = computeService.getNodes(GetNodesOptions.Builder.withDetails());
+        Set<? extends ComputeMetadata> nodes = computeService.listNodes(GetNodesOptions.Builder.withDetails());
         logger.trace("Processing Nodes {}", nodes);
-        for (Map.Entry<String, ? extends ComputeMetadata> node : nodes.entrySet()) {
-            NodeMetadata nodeMetadata = (NodeMetadata) node.getValue();
+        for (ComputeMetadata node : nodes) {
+            NodeMetadata nodeMetadata = (NodeMetadata) node;
             if (tag != null && !nodeMetadata.getTag().equals(tag)) {
                 logger.trace("Filtering node {} with unmatched tag {}", nodeMetadata.getName(), nodeMetadata.getTag());
                 continue;
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java b/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java
index b39b7248499..b950a67cd64 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/gateway/cloud/CloudGateway.java
@@ -46,6 +46,7 @@ import org.jclouds.blobstore.domain.StorageMetadata;
 import org.jclouds.domain.Location;
 
 import java.io.IOException;
+import java.util.Set;
 
 /**
  * @author kimchy (shay.banon)
@@ -75,9 +76,17 @@ public class CloudGateway extends AbstractLifecycleComponent<Gateway> implements
         if (location == null) {
             this.location = null;
         } else {
-            this.location = blobStoreContext.getBlobStore().getAssignableLocations().get(location);
+            Location matchedLocation = null;
+            Set<? extends Location> assignableLocations = blobStoreContext.getBlobStore().listAssignableLocations();
+            for (Location oLocation : assignableLocations) {
+                if (oLocation.getId().equals(location)) {
+                    matchedLocation = oLocation;
+                    break;
+                }
+            }
+            this.location = matchedLocation;
             if (this.location == null) {
-                throw new ElasticSearchIllegalArgumentException("Not a valid location [" + location + "], available locations " + blobStoreContext.getBlobStore().getAssignableLocations().keySet());
+                throw new ElasticSearchIllegalArgumentException("Not a valid location [" + location + "], available locations " + assignableLocations);
             }
         }
 
diff --git a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java
index a89dac69b98..0222c46223f 100644
--- a/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java
+++ b/plugins/cloud/src/main/java/org/elasticsearch/index/gateway/cloud/CloudIndexGateway.java
@@ -37,6 +37,8 @@ import org.elasticsearch.util.settings.Settings;
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.domain.Location;
 
+import java.util.Set;
+
 /**
  * @author kimchy (shay.banon)
  */
@@ -52,7 +54,6 @@ public class CloudIndexGateway extends AbstractIndexComponent implements IndexGa
 
     private final BlobStoreContext blobStoreContext;
 
-
     @Inject public CloudIndexGateway(Index index, @IndexSettings Settings indexSettings, CloudBlobStoreService blobStoreService, Gateway gateway) {
         super(index, indexSettings);
         this.blobStoreContext = blobStoreService.context();
@@ -84,9 +85,17 @@ public class CloudIndexGateway extends AbstractIndexComponent implements IndexGa
                 this.location = null;
             }
         } else {
-            this.location = blobStoreContext.getBlobStore().getAssignableLocations().get(location);
+            Location matchedLocation = null;
+            Set<? extends Location> assignableLocations = blobStoreContext.getBlobStore().listAssignableLocations();
+            for (Location oLocation : assignableLocations) {
+                if (oLocation.getId().equals(location)) {
+                    matchedLocation = oLocation;
+                    break;
+                }
+            }
+            this.location = matchedLocation;
             if (this.location == null) {
-                throw new ElasticSearchIllegalArgumentException("Not a valid location [" + location + "], available locations " + blobStoreContext.getBlobStore().getAssignableLocations().keySet());
+                throw new ElasticSearchIllegalArgumentException("Not a valid location [" + location + "], available locations " + assignableLocations);
             }
         }
         this.indexContainer = container;