diff --git a/cmd/docker/release/main.go b/cmd/docker/release/main.go
index a61434f9..58023f0c 100644
--- a/cmd/docker/release/main.go
+++ b/cmd/docker/release/main.go
@@ -34,36 +34,13 @@ var (
 func strPtr(str string) *string { return &str }
 
 var buildConfigurations = []docker.BuildConfiguration{
-	//docker.BuildConfiguration{
-	//	Name:            defaultRepositoryName + "/" + "btcd",
-	//	ContextFilePath: "/tmp/btcd.tar",
-	//	BuildOpts: types.ImageBuildOptions{
-	//		Dockerfile: "docker/btcd/Dockerfile",
-	//		Tags: []string{
-	//			"v0.23.4",
-	//			"latest",
-	//		},
-	//		BuildArgs: map[string]*string{
-	//			"base_image":   strPtr(defaultBuildContainer),
-	//			"target_image": strPtr("indralabs/scratch:latest"),
-	//			// This argument is the tag fetched by git
-	//			// It MUST be updated alongside the tag above
-	//			"git_repository": strPtr("github.com/btcsuite/btcd"),
-	//			"git_tag":        strPtr("v0.23.4"),
-	//		},
-	//		SuppressOutput: false,
-	//		Remove:         true,
-	//		ForceRemove:    true,
-	//		PullParent:     true,
-	//	},
-	//},
 	docker.BuildConfiguration{
-		Name:            defaultRepositoryName + "/" + "lnd",
-		ContextFilePath: "/tmp/lnd.tar",
+		Name:            defaultRepositoryName + "/" + "btcd",
+		ContextFilePath: "/tmp/btcd.tar",
 		BuildOpts: types.ImageBuildOptions{
-			Dockerfile: "docker/lnd/Dockerfile",
+			Dockerfile: "docker/btcd/btcd.Dockerfile",
 			Tags: []string{
-				"v0.15.5-beta",
+				"v0.23.4",
 				"latest",
 			},
 			BuildArgs: map[string]*string{
@@ -71,8 +48,8 @@ var buildConfigurations = []docker.BuildConfiguration{
 				"target_image": strPtr("indralabs/scratch:latest"),
 				// This argument is the tag fetched by git
 				// It MUST be updated alongside the tag above
-				"git_repository": strPtr("github.com/lightningnetwork/lnd"),
-				"git_tag":        strPtr("v0.15.5-beta"),
+				"git_repository": strPtr("github.com/btcsuite/btcd"),
+				"git_tag":        strPtr("v0.23.4"),
 			},
 			SuppressOutput: false,
 			Remove:         true,
@@ -80,6 +57,48 @@ var buildConfigurations = []docker.BuildConfiguration{
 			PullParent:     true,
 		},
 	},
+
+	docker.BuildConfiguration{
+		Name:            defaultRepositoryName + "/" + "btcctl",
+		ContextFilePath: "/tmp/btcctl.tar",
+		BuildOpts: types.ImageBuildOptions{
+			Dockerfile: "docker/btcd/btcctl.Dockerfile",
+			Tags: []string{
+				"v0.23.4",
+				"latest",
+			},
+			BuildArgs: map[string]*string{
+				"semver": strPtr("v0.23.4"),
+			},
+			SuppressOutput: false,
+			Remove:         true,
+			ForceRemove:    true,
+			PullParent:     false,
+		},
+	},
+	//docker.BuildConfiguration{
+	//	Name:            defaultRepositoryName + "/" + "lnd",
+	//	ContextFilePath: "/tmp/lnd.tar",
+	//	BuildOpts: types.ImageBuildOptions{
+	//		Dockerfile: "docker/lnd/Dockerfile",
+	//		Tags: []string{
+	//			"v0.15.5-beta",
+	//			"latest",
+	//		},
+	//		BuildArgs: map[string]*string{
+	//			"base_image":   strPtr(defaultBuildContainer),
+	//			"target_image": strPtr("indralabs/scratch:latest"),
+	//			// This argument is the tag fetched by git
+	//			// It MUST be updated alongside the tag above
+	//			"git_repository": strPtr("github.com/lightningnetwork/lnd"),
+	//			"git_tag":        strPtr("v0.15.5-beta"),
+	//		},
+	//		SuppressOutput: false,
+	//		Remove:         true,
+	//		ForceRemove:    true,
+	//		PullParent:     true,
+	//	},
+	//},
 	//docker.BuildConfiguration{
 	//	Name:            defaultRepositoryName + "/" + "indra",
 	//	ContextFilePath: "/tmp/indra-" + indra.SemVer + ".tar",
diff --git a/docker/btcd/btcctl.Dockerfile b/docker/btcd/btcctl.Dockerfile
new file mode 100644
index 00000000..e1e3a4c0
--- /dev/null
+++ b/docker/btcd/btcctl.Dockerfile
@@ -0,0 +1,6 @@
+
+ARG semver=master
+
+FROM indralabs/btcd:${semver}
+
+ENTRYPOINT ["/bin/btcctl", "--configfile=/etc/btcd/btcd.conf", "--rpccert=/etc/btcd/keys/rpc.cert"]
\ No newline at end of file
diff --git a/docker/btcd/Dockerfile b/docker/btcd/btcd.Dockerfile
similarity index 100%
rename from docker/btcd/Dockerfile
rename to docker/btcd/btcd.Dockerfile