diff --git a/Makefile b/Makefile
index 6a1aff90..42f815ed 100644
--- a/Makefile
+++ b/Makefile
@@ -237,8 +237,6 @@ endif
 .PHONY: docker-login
 docker-login: ## Log in into the Docker repository
 	@echo "+ $@"
-	./ecr-login.sh
-	rm ecr-login.sh
 
 .PHONY: docker-build
 docker-build: check-env ## Build the container
@@ -281,12 +279,20 @@ ifeq ($(INTERACTIVE), 1)
 endif
 
 .PHONY: docker-run
-docker-run: ## Build and run the container, you can use EXTRA_ARGS
+docker-run: ## Run the container in docker, you can use EXTRA_ARGS
 	@echo "+ $@"
 	docker run --rm -i $(DOCKER_FLAGS) \
 		--volume $(HOME)/.kube/config:/home/jenkins-operator/.kube/config \
 		$(REPO):$(GITCOMMIT) $(ARGS)
 
+.PHONY: minikube-run
+minikube-run: export WATCH_NAMESPACE = $(NAMESPACE)
+minikube-run: export OPERATOR_NAME = $(NAME)
+minikube-run: start-minikube ## Run the operator locally and use minikube as Kubernetes cluster, you can use EXTRA_ARGS
+	@echo "+ $@"
+	kubectl config use-context minikube
+	build/_output/bin/jenkins-operator $(EXTRA_ARGS)
+
 .PHONY: deepcopy-gen
 deepcopy-gen: ## Generate deepcopy golang code
 	@echo "+ $@"
@@ -297,6 +303,12 @@ deepcopy-gen: ## Generate deepcopy golang code
 		$(API_VERSION) \
 		--go-header-file "./pkg/boilerplate.go.txt"
 
+.PHONY: start-minikube
+start-minikube: ## Start minikube
+	@echo "+ $@"
+	@minikube status && exit 0 || \
+	minikube start --kubernetes-version $(MINIKUBE_KUBERNETES_VERSION) --vm-driver=$(MINIKUBE_DRIVER)
+
 .PHONY: bump-version
 BUMP := patch
 bump-version: ## Bump the version in the version file. Set BUMP to [ patch | major | minor ]
diff --git a/config.env b/config.env
index bc36fa28..662afa17 100644
--- a/config.env
+++ b/config.env
@@ -1,7 +1,10 @@
 # Setup variables for the Makefile
 NAME=jenkins-operator
-PKG=jenkins-operator
+PKG=github.com/VirtusLab/jenkins-operator
 DOCKER_REGISTRY=
 REPO=jenkins-operator
 NAMESPACE=default
-API_VERSION=jenkins:v1alpha1
\ No newline at end of file
+API_VERSION=jenkins:v1alpha1
+MINIKUBE_KUBERNETES_VERSION=v1.10.9
+MINIKUBE_DRIVER=virtualbox
+ENVIRONMENT=minikube
\ No newline at end of file