diff --git a/argus/config_generator/windows/cb_init.py b/argus/config_generator/windows/cb_init.py
index f4da697f..fb3399bd 100644
--- a/argus/config_generator/windows/cb_init.py
+++ b/argus/config_generator/windows/cb_init.py
@@ -34,7 +34,8 @@ class BasePopulatedCBInitConfig(base.BaseWindowsConfig):
         util.EC2_SERVICE: "ec2service.EC2Service",
         util.OPEN_NEBULA_SERVICE: "opennebulaservice.OpenNebulaService",
         util.CLOUD_STACK_SERVICE: "cloudstack.CloudStack",
-        util.MAAS_SERVICE: "maasservice.MaaSHttpService"
+        util.MAAS_SERVICE: "maasservice.MaaSHttpService",
+        util.DIGITALOCEAN_SERVICE: "digitalocean.DigitalOceanService"
     }
 
     def __init__(self, client):
diff --git a/argus/recipes/cloud/windows.py b/argus/recipes/cloud/windows.py
index ac73c7c1..fb32186f 100644
--- a/argus/recipes/cloud/windows.py
+++ b/argus/recipes/cloud/windows.py
@@ -831,3 +831,8 @@ def prepare_cbinit_config(self, service_type):
         self._cbinit_conf.set_conf_value(
             name="user_password_length",
             value="3")
+
+
+class DigitalOceanRecipe(CloudbaseinitRecipe):
+
+    config_group = util.DIGITALOCEAN_SERVICE
diff --git a/argus/util.py b/argus/util.py
index d419c837..0f88c269 100644
--- a/argus/util.py
+++ b/argus/util.py
@@ -54,11 +54,13 @@
 OPEN_NEBULA_SERVICE = 'opennebula'
 CLOUD_STACK_SERVICE = 'cloudstack'
 MAAS_SERVICE = 'maas'
+DIGITALOCEAN_SERVICE = "digitalocean"
 
 DEFAULT_METADATA_URL = {
     HTTP_SERVICE: "http://169.254.169.254/",
     EC2_SERVICE: "http://169.254.169.254/",
     CLOUD_STACK_SERVICE: "http://10.1.1.1/",
+    DIGITALOCEAN_SERVICE: "http://169.254.169.254/metadata/v1/",
 
     OPEN_NEBULA_SERVICE: "",
     MAAS_SERVICE: "",
diff --git a/ci/tests.py b/ci/tests.py
index 3e2f52a7..c054b1ac 100644
--- a/ci/tests.py
+++ b/ci/tests.py
@@ -261,3 +261,10 @@ class ScenarioPasswordLength(BaseWindowsScenario):
 
     test_classes = (test_smoke.TestPasswordLength,)
     recipe_type = recipe.CloudbaseinitPasswordRecipe
+
+
+class ScenarioDigitalOcean(BaseWindowsScenario):
+
+    test_classes = (smoke.TestNoError, )
+    service_type = util.DIGITALOCEAN_SERVICE
+    recipe_type = recipe.DigitalOceanRecipe
diff --git a/requirements.txt b/requirements.txt
index 5a64ea3b..9b209cd3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,4 +8,4 @@ oslo.config
 python-keystoneclient
 python-heatclient
 cherrypy
-git+https://github.com/cloudbase/arestor.git@master#egg=arestor-0.1.0
+git+https://github.com/cloudbase/arestor.git@master#egg=arestor-0.1.1