diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 6aa409b..2d8a4fd 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -1,4 +1,4 @@
-name: Go
+name: CI
 on:
   push:
     branches: [ "main" ]
@@ -16,9 +16,6 @@ jobs:
       with:
         go-version: 1.19
 
-    - name: Build image
-      run: make docker
-
     - name: Build
       run: go build -v ./...
 
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 49bddf1..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM wiremock/wiremock:2.35.0
-
-RUN mkdir /home/wiremock/mappings && mkdir /home/wiremock/__files 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index fd48cf9..0000000
--- a/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-.PHONY: docker
-docker:
-	docker build -t wiremock/wiremock:2.35.0-for-tc .
diff --git a/README.md b/README.md
index 02951f2..0c26374 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,9 @@
 [![Slack](https://img.shields.io/badge/slack-slack.wiremock.org-brightgreen?style=flat&logo=slack)](https://slack.wiremock.org/)
 [![GitHub contributors](https://img.shields.io/github/contributors/wiremock/wiremock-testcontainers-go)](https://github.com/wiremock/wiremock-testcontainers-go/graphs/contributors)
 
-## Note
-
-The Testcontainers module does not work with the official image at the moment,
-because the Mappings and Files directories are not initialized there.
-Use a custom image on the top of it, see `Dockerfile`.
+This module allows provisioning the WireMock server as a standalone container within your unit tests,
+based on [WireMock Docker](https://github.com/wiremock/wiremock-docker) `2.35.0-1` or above.
+Custom images are supported too as long as they follow the same CLI and API structure.
 
 ## Supported features
 
diff --git a/tc-wiremock.go b/tc-wiremock.go
index a58acd3..af20b18 100644
--- a/tc-wiremock.go
+++ b/tc-wiremock.go
@@ -10,7 +10,7 @@ import (
 )
 
 const defaultWireMockImage = "docker.io/wiremock/wiremock"
-const defaultWireMockVersion = "2.35.0-for-tc"
+const defaultWireMockVersion = "2.35.0-1"
 const defaultPort = "8080"
 
 type WireMockContainer struct {