diff --git a/.devcontainer.json b/.devcontainer.json
index 54ddfa1a130f8..30fdae0806698 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -3,7 +3,12 @@
 {
 	"name": "pandas",
 	"context": ".",
-	"dockerFile": "Dockerfile",
+	"service": "dev",
+	"workspaceFolder": "/home/pandas",
+	"dockerComposeFile": "docker-compose.yml",
+	// The 'dockerFile' property is optional and can be used instead of 'dockerComposeFile' if you want to use a single Dockerfile.
+	// If you use 'dockerFile', uncomment the line below and remove the 'dockerComposeFile' line above.
+	// "dockerFile": "Dockerfile",
 
 	// Use 'settings' to set *default* container specific settings.json values on container create.
 	// You can edit these settings after create using File > Preferences > Settings > Remote.
diff --git a/Dockerfile b/Dockerfile
index e778312fd3aa2..425f789ee3f28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@ RUN apt-get update && \
     apt-get --no-install-recommends -y install \
     build-essential \
     bash-completion \
+    # Install Qt5 dependencies for pytest-qt, only for m chip Macs
+    #-y qt5-qmake qtbase5-dev\
     # hdf5 needed for pytables installation
     libhdf5-dev \
     # libgles2-mesa needed for pytest-qt
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000000..d8090990f67c3
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,8 @@
+version: '3'
+services:
+  dev:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      # Uncomment the line below if you are using Mac with M1/M2/M3 and encounter build issues.
+      # platform: linux/amd64