diff --git a/bubble-server/src/main/java/bubble/service/packer/PackerJob.java b/bubble-server/src/main/java/bubble/service/packer/PackerJob.java
index b81dbc48..f9bc1a6b 100644
--- a/bubble-server/src/main/java/bubble/service/packer/PackerJob.java
+++ b/bubble-server/src/main/java/bubble/service/packer/PackerJob.java
@@ -299,7 +299,7 @@ public class PackerJob implements Callable<List<PackerImage>> {
         final File varsDir = mkdirOrDie(abs(tempDir) + "/roles/"+ROLE_BUBBLE+"/vars");
         final StringBuilder b = new StringBuilder();
         for (Map.Entry<String, String> var : versions.entrySet()) {
-            b.append(var.getKey()).append(" : '").append(var.getValue()).append("'\n");
+            b.append(var.getKey().replace("-", "_")).append(" : '").append(var.getValue()).append("'\n");
         }
         FileUtil.toFileOrDie(new File(varsDir, "main.yml"), b.toString());
     }
diff --git a/bubble-server/src/main/java/bubble/service/packer/PackerService.java b/bubble-server/src/main/java/bubble/service/packer/PackerService.java
index c7bfe8b4..1b927c73 100644
--- a/bubble-server/src/main/java/bubble/service/packer/PackerService.java
+++ b/bubble-server/src/main/java/bubble/service/packer/PackerService.java
@@ -46,7 +46,7 @@ public class PackerService {
 
     public static final String ROLE_ALGO = "algo";
     public static final String ROLE_MITMPROXY = "mitmproxy";
-    public static final String ROLE_DNSCRYPT = "dnscrypt";
+    public static final String ROLE_DNSCRYPT = "dnscrypt-proxy";
     public static final String ROLE_BUBBLE = "bubble";
 
     public static final String PACKER_KEY_NAME = "packer_rsa";
diff --git a/bubble-server/src/main/resources/packer/roles/bubble/templates/bubble_versions.properties.j2 b/bubble-server/src/main/resources/packer/roles/bubble/templates/bubble_versions.properties.j2
index 16acdfe9..37ed237e 100644
--- a/bubble-server/src/main/resources/packer/roles/bubble/templates/bubble_versions.properties.j2
+++ b/bubble-server/src/main/resources/packer/roles/bubble/templates/bubble_versions.properties.j2
@@ -1,3 +1,3 @@
 algo_version={{ algo_version }}
-dnscrypt_version={{ dnscrypt_version }}
+dnscrypt_version={{ dnscrypt_proxy_version }}
 mitmproxy_version={{ mitmproxy_version }}