diff --git a/abra.sh b/abra.sh
index d7c5024..ea81aaa 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
 export CLICKHOUSE_CONF_VERSION=v2
 export CLICKHOUSE_USER_CONF_VERSION=v2
 export DB_ENTRYPOINT_VERSION=v1
-export CLICKHOUSE_ENTRYPOINT_VERSION=v1
+export CLICKHOUSE_ENTRYPOINT_VERSION=v2
diff --git a/entrypoint.clickhouse.sh b/entrypoint.clickhouse.sh
index 9e54283..48f7ac7 100644
--- a/entrypoint.clickhouse.sh
+++ b/entrypoint.clickhouse.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 CLICKHOUSE_BACKUP_VERSION=2.4.2
 
@@ -13,6 +13,8 @@ elif [[ $ARCH =~ "armv6l" ]]; then
   ARCH="armv6"
 elif [[ $ARCH =~ "armv7l" ]]; then
   ARCH="armv7"
+elif [[ $ARCH =~ "x86_64" ]]; then
+  ARCH="amd64"
 fi
 
 wget \