diff --git a/cloudformation/Makefile b/cloudformation/Makefile
index 325963a..c99c1b3 100644
--- a/cloudformation/Makefile
+++ b/cloudformation/Makefile
@@ -26,14 +26,14 @@ ifeq ($(ENVIRONMENT_NAME),production)
 	GITHUB_BRANCH=master
 	DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_PRODUCTION)
 	CPU_SIZE=1024
-	MEMORY_SIZE=4GB
+	MEMORY_SIZE=2GB
 	BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-live-queue
 else
 	SUBDOMAIN=$(STACK_NAME)-$(ENVIRONMENT_NAME)
 	GITHUB_BRANCH=$(ENVIRONMENT_NAME)
 	DB_SECURITY_GROUP_ID=$(DB_SECURITY_GROUP_ID_STAGING)
-	CPU_SIZE=512
-	MEMORY_SIZE=2GB
+	CPU_SIZE=256
+	MEMORY_SIZE=1GB
 	BERNARD_SQS_POLICY=arn:aws:iam::954747537408:policy/pw-publish-photowall-bernard-stage-queue
 endif
 
@@ -47,7 +47,7 @@ check-create-initial-ecr-image:
 				echo "ECR Repo for initial image does not exist, creating"; \
 				echo ""; \
 				aws ecr create-repository --repository $(STACK_NAME)-$(ENVIRONMENT_NAME); \
-				$$(aws ecr get-login --no-include-email --region eu-west-1); \
+				docker login -u AWS -p $(shell aws ecr get-login-password --region eu-west-1) $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME); \
 				docker pull nginx; \
 				docker tag nginx $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME):latest; \
 				docker push $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(STACK_NAME)-$(ENVIRONMENT_NAME):latest; \