diff --git a/createhdds.py b/createhdds.py
index 7a74089..eb2a84a 100755
--- a/createhdds.py
+++ b/createhdds.py
@@ -62,10 +62,13 @@ def supported_arches():
     """
     powerpc_arches = ['ppc64', 'ppc64le', 'noarch']
     intel_arches = ['i686', 'x86_64', 'noarch']
+    aarch64_arches = ['aarch64', 'armv7l']
     if CPUARCH in powerpc_arches:
         supported_arches = powerpc_arches
     elif CPUARCH in intel_arches:
         supported_arches = intel_arches
+    elif CPUARCH == 'aarch64':
+        supported_arches = aarch64_arches
     else:
         supported_arches = []
         logger.info("Need to add a list of supported arches for %s CPU", CPUARCH)
diff --git a/hdds.json b/hdds.json
index 0c16ef3..0566e9f 100644
--- a/hdds.json
+++ b/hdds.json
@@ -127,8 +127,8 @@
         {
             "name" : "minimal",
             "releases" : {
-                "-1" : ["x86_64", "ppc64le", "ppc64"],
-                "-2" : ["x86_64", "ppc64le", "ppc64"]
+                "-1" : ["x86_64", "ppc64le", "ppc64", "aarch64"],
+                "-2" : ["x86_64", "ppc64le", "ppc64", "aarch64"]
             },
             "size" : "6",
             "imgver": "2"
@@ -155,8 +155,8 @@
         {
             "name" : "server",
             "releases" : {
-                "stable" : ["x86_64", "ppc64le", "ppc64"],
-                "branched": ["x86_64", "ppc64le", "ppc64"]
+                "stable" : ["x86_64", "ppc64le", "ppc64", "aarch64"],
+                "branched": ["x86_64", "ppc64le", "ppc64", "aarch64"]
             },
             "size" : "6",
             "imgver": "3",
@@ -174,7 +174,7 @@
         {
             "name" : "support",
             "releases" : {
-                "current" : ["x86_64", "ppc64le", "ppc64"]
+                "current" : ["x86_64", "ppc64le", "ppc64", "aarch64"]
             },
             "size" : "6",
             "imgver" : "3"