diff --git a/Makefile b/Makefile
index 492cd473..6acd821c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,56 +19,33 @@
 #
 SHELL := /bin/bash
 
-VERSION ?= 2.0.0-SNAPSHOT
+VERSION := 2.0.0-SNAPSHOT
 LAST_RELEASED_IMAGE_NAME := hawtio/online
 LAST_RELEASED_VERSION ?= 1.12.0
 CONTROLLER_GEN_VERSION := v0.6.1
 OPERATOR_SDK_VERSION := v1.26.1
 KUSTOMIZE_VERSION := v4.5.4
 OPM_VERSION := v1.24.0
-IMAGE_NAME ?= hawtio/online
+IMAGE_NAME ?= quay.io/hawtio/online
+
+# Replace SNAPSHOT with the current timestamp
+DATETIMESTAMP=$(shell date -u '+%Y%m%d-%H%M%S')
+VERSION := $(subst -SNAPSHOT,-$(DATETIMESTAMP),$(VERSION))
 
 #
 # Situations when user wants to override
 # the image name and version
 # - used in kustomize install
-# - used in making bundle
 # - need to preserve original image and version as used in other files
 #
 CUSTOM_IMAGE ?= $(IMAGE_NAME)
 CUSTOM_VERSION ?= $(VERSION)
 
-METADATA_IMAGE_NAME := $(CUSTOM_IMAGE)-metadata
-BUNDLE_IMAGE_NAME ?= $(CUSTOM_IMAGE)-bundle
 RELEASE_GIT_REMOTE := origin
 GIT_COMMIT := $(shell if [ -d .git ]; then git rev-list -1 HEAD; else echo "$(CUSTOM_VERSION)"; fi)
 LINT_GOGC := 10
 LINT_DEADLINE := 10m
 
-
-# olm bundle vars
-MANAGER := config/manager
-MANIFESTS := config/manifests
-CHANNELS ?= $(shell v=$(OPERATOR_VERSION) && echo "stable-$${v%\.[0-9]}"),candidate,latest
-DEFAULT_CHANNEL ?= $(shell v=$(OPERATOR_VERSION) && echo "stable-$${v%\.[0-9]}")
-PACKAGE := hawtio
-CSV_VERSION := $(CUSTOM_VERSION)
-CSV_NAME := $(PACKAGE).v$(CSV_VERSION)
-# Final CSV name that replaces the name required by the operator-sdk
-# Has to be replaced after the bundle has been generated
-CSV_PRODUCTION_NAME := $(LAST_RELEASED_IMAGE_NAME).v$(CSV_VERSION)
-CSV_DISPLAY_NAME := Hawtio Online
-CSV_SUPPORT := Hawtio
-CSV_REPLACES := $(LAST_RELEASED_IMAGE_NAME).v$(LAST_RELEASED_VERSION)
-CSV_FILENAME := $(PACKAGE).clusterserviceversion.yaml
-CSV_PATH := $(MANIFESTS)/bases/$(CSV_FILENAME)
-CSV_PRODUCTION_PATH := bundle/manifests/$(CSV_FILENAME)
-
-# Test Bundle Index
-BUNDLE_INDEX := quay.io/operatorhubio/catalog:latest
-INDEX_DIR := index
-OPM := opm
-
 define LICENSE_HEADER
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
diff --git a/deploy/base/deployment.yml b/deploy/base/deployment.yml
index 1eb735be..35526796 100644
--- a/deploy/base/deployment.yml
+++ b/deploy/base/deployment.yml
@@ -23,7 +23,7 @@ spec:
         deployment: hawtio-online
     spec:
       containers:
-        - image: hawtio/online
+        - image: quay.io/hawtio/online
           imagePullPolicy: Always
           name: hawtio-online
           ports:
diff --git a/package.json b/package.json
index d5a31f81..68269fd9 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "lint:fix": "yarn eslint packages/ --fix",
     "format:check": "yarn prettier --check packages/",
     "format:fix": "yarn prettier --write packages/",
-    "image": "docker build -t docker.io/${ORG:-hawtio}/${PROJECT:-online}:${TAG:-latest} .",
+    "image": "docker build -t quay.io/${ORG:-hawtio}/${PROJECT:-online}:${TAG:-latest} .",
     "license": "mkdir -p docker/licenses && yarn licenses generate-disclaimer -R > docker/licenses/licenses.txt",
     "gen:proxying": "./scripts/generate-proxying.sh",
     "gen:serving": "./scripts/generate-serving.sh",
@@ -45,7 +45,7 @@
     "deploy:k8s:cluster": "./scripts/kube-apply.sh deploy/k8s/cluster/",
     "deploy:openshift:namespace": "./scripts/kube-apply.sh deploy/openshift/namespace/",
     "deploy:openshift:cluster": "./scripts/kube-apply.sh deploy/openshift/cluster/ && ./deploy/openshift/cluster/oauthclient.sh $ROUTE_HOSTNAME",
-    "kustomize:image": "cd deploy/base && kustomize edit set image hawtio/online=docker.io/${ORG:-hawtio}/${PROJECT:-online}:${TAG:-latest}"
+    "kustomize:image": "cd deploy/base && kustomize edit set image hawtio/online=quay.io/${ORG:-hawtio}/${PROJECT:-online}:${TAG:-latest}"
   },
   "devDependencies": {
     "concurrently": "^8.2.2",