diff --git a/Dockerfile b/Dockerfile
index dad4f9d6..ecc4d89d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ LABEL org.opencontainers.image.title="MindsDB" \
     org.opencontainers.image.description="Streamline AI development with MindsDB in your Docker environment. Deploy, manage, and scale your AI models seamlessly." \
     org.opencontainers.image.vendor="MindsDB" \
     com.docker.desktop.extension.api.version="0.3.0" \
-    com.docker.extension.screenshots="mindsdb_screenshot.png" \ 
+    com.docker.extension.screenshots='[{"alt": "Screenshot of MindsDB Docker Extension", "url": "https://raw.githubusercontent.com/mindsdb/mindsdb-docker-extension/main/mindsdb_screenshot.png"}]' \ 
     com.docker.extension.categories="Databases" \
     com.docker.desktop.extension.icon="https://uploads-ssl.webflow.com/62a8755be8bcc86e6307def8/63b75a4a90fefbed813c6549_Mindsdb-V%20logo.svg" \
     com.docker.extension.detailed-description="MindsDB abstracts LLMs, time series, regression, and classification models as virtual tables (AI-Tables). Since SQL is an effective declarative language for data manipulation, it’s also an ideal foundation for constructing data-centric AI." \
diff --git a/Makefile b/Makefile
index f9e96c5d..7eff5d8c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@ update-extension: build-extension ## Update the extension
 prepare-buildx: ## Create buildx builder for multi-arch build, if not exists
 	docker buildx inspect $(BUILDER) || docker buildx create --name=$(BUILDER) --driver=docker-container --driver-opt=network=host
 
+validate-extension: ## Validate extension is ready to be published
+	docker extension validate mindsdb/mindsdb-docker-extension:1.0.0
+
 push-extension: prepare-buildx ## Build & Upload extension image to hub. Do not push if tag already exists: make push-extension tag=0.1
 	docker pull $(IMAGE):$(TAG) && echo "Failure: Tag already exists" || docker buildx build --push --builder=$(BUILDER) --platform=linux/amd64,linux/arm64 --build-arg TAG=$(TAG) --tag=$(IMAGE):$(TAG) .
 
diff --git a/README.md b/README.md
index 41886e8e..43590a3b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MindsDB Docker Desktop Extension
 
-<img width="1458" alt="image" src="https://user-images.githubusercontent.com/34368930/230012152-c60bc8a8-3c00-48c9-961c-6d10421e7e26.png">
+<img width="1458" alt="image" src="mindsdb_screenshot.png">
 
 This is the Docker Desktop Extension for MindsDB. It allows you to use MindsDB within Docker Desktop.
 
diff --git a/mindsdb.png b/mindsdb.png
deleted file mode 100644
index 78c0cf69..00000000
Binary files a/mindsdb.png and /dev/null differ
diff --git a/mindsdb_screenshot.png b/mindsdb_screenshot.png
index 292f43f2..dcad7339 100644
Binary files a/mindsdb_screenshot.png and b/mindsdb_screenshot.png differ