diff --git a/.version b/.version
index e07d136..45a9970 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-v0.6.0
\ No newline at end of file
+v0.6.1
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c622d1..642859e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.6.1
+
+- **Features:**
+  - Add warning when running on arm64 that support is currently experimental and not yet fully working
+- **Bugs:**
+  - Fix a bug where installer would fail after inputting configuration if dragonchain config folder didn't already exist
+  - Fix install script for arm64
+
 ## v0.6.0
 
 - **Features:**
diff --git a/cmd/dc-installer/main.go b/cmd/dc-installer/main.go
index 8593a11..6c9051a 100644
--- a/cmd/dc-installer/main.go
+++ b/cmd/dc-installer/main.go
@@ -111,6 +111,7 @@ func main() {
 		if !(configuration.ARM64 && configuration.Linux) {
 			fatalLog("Unsupported OS/Architecture")
 		}
+		fmt.Println("WARNING!!! ARM64 support is currently experimental and not fully working/supported.")
 	}
 	if len(os.Args) > 1 && (os.Args[1] == "-V" || os.Args[1] == "--version" || os.Args[1] == "version") {
 		fmt.Println(configuration.Version)
diff --git a/internal/configuration/input.go b/internal/configuration/input.go
index bb1b361..1f6e457 100644
--- a/internal/configuration/input.go
+++ b/internal/configuration/input.go
@@ -298,6 +298,13 @@ func PromptForUserConfiguration() (*Configuration, error) {
 	if err != nil {
 		return nil, err
 	}
+	folder, err := credentialFolderPath()
+	if err != nil {
+		return nil, err
+	}
+	if err := os.MkdirAll(folder, os.ModePerm); err != nil {
+		return nil, err
+	}
 	configFile, err := configFilePath()
 	if err != nil {
 		return nil, err
diff --git a/scripts/get_installer.bash b/scripts/get_installer.bash
index ac913b1..e184785 100755
--- a/scripts/get_installer.bash
+++ b/scripts/get_installer.bash
@@ -2,7 +2,7 @@
 set -e
 
 # Default version (change with new tagged releases)
-VERSION="v0.6.0"
+VERSION="v0.6.1"
 
 if [ -z "$HOME" ]; then
     echo "The \$HOME environment variable must be present"
@@ -15,8 +15,15 @@ if [ "$OS" != "linux" ] && [ "$OS" != "darwin" ]; then
     exit 1
 fi
 
-if [ "$(uname -m)" != "x86_64" ]; then
-    echo "The installer only works on 64 bit machines"
+ARCH=""
+if [ "$(uname -m)" = "x86_64" ]; then
+    ARCH="amd64"
+fi
+if [ "$(uname -m)" = "aarch64" ]; then
+    ARCH="arm64"
+fi
+if [ "$ARCH" = "" ]; then
+    echo "This installer only works for 64 bit cpus (amd64 or arm64)"
     exit 1
 fi
 
@@ -59,7 +66,7 @@ mkdir -p "$HOME/.local/bin/"
 # Download the installer if necessary
 LOCAL_FILE="$HOME/.local/bin/dc-installer-$VERSION"
 if [ ! -f "$LOCAL_FILE" ]; then
-    DOWNLOAD_URL="https://github.com/dragonchain/dragonchain-installer/releases/download/$VERSION/dc-installer-$OS-amd64"
+    DOWNLOAD_URL="https://github.com/dragonchain/dragonchain-installer/releases/download/$VERSION/dc-installer-$OS-$ARCH"
     echo "Downloading installer at $DOWNLOAD_URL"
     if [ "$DL_CMD" = "curl" ]; then
         curl -Lf "$DOWNLOAD_URL" -o "$LOCAL_FILE"