diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 7ad19d81..a88aae05 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -310,25 +310,16 @@ jobs:
         run: echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
-      - name: Base Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile.base
-          tags: "base"
+      - name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
 
-      - name: Dev Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
+      - name: Docker Login
         env:
-          VERSION: ${{ env.VERSION }}
-          ARCH: amd64
-          DOCKER_CLI_EXPERIMENTAL: enabled
-        with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile
-          tags: "dev"
-          buildargs: VERSION,ARCH
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+
+      - name: Docker Buildx (push)
+        run: |
+          docker buildx create --use
+          docker buildx build --tag=statping/statping:dev --build-arg=VERSION=${VERSION} --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7 --output type=image,name=docker.io/statping/statping,push=true .
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 38fbb862..d4a3f39a 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -412,28 +412,19 @@ jobs:
         run: echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
-      - name: Base Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile.base
-          tags: "base"
+      - name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
 
-      - name: Latest/Version Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
+      - name: Docker Login
         env:
-          VERSION: ${{ env.VERSION }}
-          ARCH: amd64
-          DOCKER_CLI_EXPERIMENTAL: enabled
-        with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile
-          tags: "latest,v${{ env.VERSION }}"
-          buildargs: VERSION,ARCH
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+
+      - name: Docker Buildx (push)
+        run: |
+          docker buildx create --use
+          docker buildx build --tag=statping/statping,statping/statping:v${VERSION} --build-arg=VERSION=${VERSION} --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7 --output type=image,name=docker.io/statping/statping,push=true .
 
   sentry-release:
     needs: upload-release
diff --git a/Makefile b/Makefile
index 98721fcc..4a0bf99a 100644
--- a/Makefile
+++ b/Makefile
@@ -331,5 +331,9 @@ certs:
 	  -keyout key.pem \
 	  -subj "/C=US/ST=California/L=Santa Monica/O=Statping/OU=Development/CN=localhost"
 
-.PHONY: all build build-all build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman
+buildx:
+	docker buildx create --use
+	docker buildx build --tag=statping/statping:dev --build-arg=VERSION=${VERSION} --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7 --output type=image,name=docker.io/statping/statping,push=true .
+
+.PHONY: all build build-all buildx build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman
 .SILENT: travis_s3_creds
diff --git a/cmd/cli.go b/cmd/cli.go
index 8c06a086..117ac325 100644
--- a/cmd/cli.go
+++ b/cmd/cli.go
@@ -189,9 +189,9 @@ func importCli(args []string) error {
 
 	if exportData.Config != nil {
 		if ask("Create config.yml file from Configs?") {
-			log.Printf("Database User:   %d\n", exportData.Config.DbUser)
-			log.Printf("Database Password:   %d\n", exportData.Config.DbPass)
-			log.Printf("Database Host:   %d\n", exportData.Config.DbHost)
+			log.Printf("Database User:   %s\n", exportData.Config.DbUser)
+			log.Printf("Database Password:   %s\n", exportData.Config.DbPass)
+			log.Printf("Database Host:   %s\n", exportData.Config.DbHost)
 			log.Printf("Database Port:   %d\n", exportData.Config.DbPort)
 			if err := exportData.Config.Save(utils.Directory); err != nil {
 				return err