diff --git a/.env.dev b/.env.dev
index d3a9c25..fd5ac51 100644
--- a/.env.dev
+++ b/.env.dev
@@ -3,4 +3,6 @@ PROXY_PORT=
 ACCESS_KEY_ID=
 SECRET_ACCESS_KEY=
 IAM_DIR=
-SETUP_DIR=
\ No newline at end of file
+SETUP_DIR=
+AZ_ACCOUNT_NAME=devstoreaccount1
+AZ_ACCOUNT_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==
\ No newline at end of file
diff --git a/Makefile b/Makefile
index a372845..96485d9 100644
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,11 @@ up-posix:
 up-proxy:
 	docker compose --env-file .env.dev up proxy
 
+# Creates and runs S3 gateway to azurite instance in a docker container
+.PHONY: up-azurite
+up-azurite:
+	docker compose --env-file .env.dev up azurite azuritegw
+
 # Creates and runs both S3 gateway and proxy server instances in docker containers
 .PHONY: up-app
 up-app:
diff --git a/cmd/versitygw/azure.go b/cmd/versitygw/azure.go
index 8fe81f4..0fa0e0a 100644
--- a/cmd/versitygw/azure.go
+++ b/cmd/versitygw/azure.go
@@ -35,15 +35,15 @@ func azureCommand() *cli.Command {
 			&cli.StringFlag{
 				Name:        "account",
 				Usage:       "azure account name",
-				EnvVars:     []string{"AZ_ACCESS_KEY"},
+				EnvVars:     []string{"AZ_ACCOUNT_NAME"},
 				Aliases:     []string{"a"},
 				Destination: &azAccount,
 			},
 			&cli.StringFlag{
-				Name:        "account-key",
+				Name:        "access-key",
 				Usage:       "azure account key",
-				EnvVars:     []string{"AZ_ACCOUNT_KEY"},
-				Aliases:     []string{"s"},
+				EnvVars:     []string{"AZ_ACCESS_KEY"},
+				Aliases:     []string{"k"},
 				Destination: &azKey,
 			},
 			&cli.StringFlag{
diff --git a/docker-compose.yml b/docker-compose.yml
index 1b51c79..83e2b52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,3 +21,18 @@ services:
     ports:
       - "${PROXY_PORT}:${PROXY_PORT}"
     command: ["sh", "-c", CompileDaemon -build="go build -C ./cmd/versitygw -o versitygw" -command="./cmd/versitygw/versitygw -p :$PROXY_PORT s3 -a $ACCESS_KEY_ID -s $SECRET_ACCESS_KEY --endpoint http://posix:$POSIX_PORT"]
+  azurite:
+    image: mcr.microsoft.com/azure-storage/azurite
+    ports:
+      - "10000:10000"
+      - "10001:10001"
+      - "10002:10002"
+  azuritegw:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.dev
+    volumes:
+      - ./:/app
+    ports:
+      - 7070:7070
+    command: ["sh", "-c", CompileDaemon -build="go build -C ./cmd/versitygw -o versitygw" -command="./cmd/versitygw/versitygw -a $ACCESS_KEY_ID -s $SECRET_ACCESS_KEY --iam-dir $IAM_DIR azure -a $AZ_ACCOUNT_NAME -k $AZ_ACCOUNT_KEY --url http://azurite:10000/$AZ_ACCOUNT_NAME"]