diff --git a/.github/workflows/build-push-images.yml b/.github/workflows/build-push-images.yml
new file mode 100644
index 0000000..3356eb4
--- /dev/null
+++ b/.github/workflows/build-push-images.yml
@@ -0,0 +1,46 @@
+name: Docker Image CI
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main", "dev", 'releases/**', 'issue_**' ]
+  pull_request:
+    branches: [ "main", "dev"  ]
+
+env:
+  REGISTRY: ghcr.io
+  
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Login to the Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        
+      - name: Extract Metadata (tags and labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
+
+      - name: Build & Push Docker Image(s)
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.ref_name }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..fec4670
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,68 @@
+SHELL := /bin/bash
+.ONESHELL:
+.DEFAULT_GOAL := help
+.PHONY: all help
+
+# Executable definitions docker|podman etc.
+CONTAINER_BIN =docker
+
+GIT_BRANCH=$(shell git branch --show-current)
+
+# Target tags for pushing to
+REGISTRY_HOST=ghcr.io
+IMAGE_USERNAME=haisamido
+IMAGE_NAME=nos3-64
+IMAGE_TAG=${GIT_BRANCH}
+
+IMAGE_URI=${REGISTRY_HOST}/${IMAGE_USERNAME}/${IMAGE_NAME}:${IMAGE_TAG}
+
+#
+DOCKERFILE=Dockerfile
+
+GIT_TOKEN=${HOME}/.github.com/access_token
+
+nos3-64-pull-prebuilt: ## pull pre-built nos3-64 from remote
+	${CONTAINER_BIN} pull ${IMAGE_URI}
+
+nos3-64-build: ## build nos3-base from nos3-64 (Look at Dockerfile)
+	@$(call print_message,33,Building ${IMAGE_URI} ...)
+	${CONTAINER_BIN} build --file ${DOCKERFILE} -t ${IMAGE_URI} .
+
+nos3-64-push: | registry-login nos3-64-build ## push nos3-64 to remote (build runs first)
+	@$(call print_message,33,Pushing ${IMAGE_URI} ...)
+	${CONTAINER_BIN} push ${IMAGE_URI}
+
+registry-login: ## image registry-login
+	@$(call print_message,33,Logging into ${REGISTRY_HOST} via ${CONTAINER_BIN} login ...)
+	@cat ${GIT_TOKEN} | \
+		${CONTAINER_BIN} login ${REGISTRY_HOST} -u ${IMAGE_USERNAME} --password-stdin
+
+#------------------------------------------------------------------------------
+define print_header
+	@printf '%*s\n' "$(TERM_WIDTH)" '' | tr ' ' '-'
+	@printf '%-*s\n' "$(TERM_WIDTH)" "$(1)"
+	@printf '%*s\n' "$(TERM_WIDTH)" '' | tr ' ' '-'
+endef
+
+define print_message
+	@printf "\033[$(1)m$(2)\033[0m\n"
+endef
+#------------------------------------------------------------------------------
+
+#---
+RESET  = \033[0m
+PURPLE = \033[0;35m
+GREEN  = \033[0;32m
+LINE   = $(PURPLE)----------------------------------------------------------------------------------------$(RESET)
+
+help: ## this help target
+	@echo
+	@printf "\033[37m%-30s\033[0m %s\n" "#----------------------------------------------------------------------------------------"
+	@printf "\033[37m%-30s\033[0m %s\n" "# Makefile targets: make <TARGET>, e.g. make registry-login                                                                     "
+	@printf "\033[37m%-30s\033[0m %s\n" "#----------------------------------------------------------------------------------------"
+	@echo 
+	@printf "\033[37m%-30s\033[0m %s\n" "#-target-----------------------description-----------------------------------------------"
+	@grep -E '^[a-zA-Z_-].+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@echo 
+
+print-%  : ; @echo $* = $($*)