diff --git a/bitcoind/Dockerfile b/bitcoind/Dockerfile
index feb830d..2d5f4b6 100644
--- a/bitcoind/Dockerfile
+++ b/bitcoind/Dockerfile
@@ -1,5 +1,5 @@
 # Build stage for Bitcoin Core
-FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM}} alpine:3.18 as bitcoin-core
+FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM:-linux/amd64}} alpine:3.18 as bitcoin-core
 
 ARG TARGETPLATFORM
 
@@ -84,7 +84,7 @@ RUN strip ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.a
 RUN strip ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.so.0.0.0
 
 # Runtime binaries and setup stage
-FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM}} alpine:3.18 as runner
+FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM:-linux/amd64}} alpine:3.18 as runner
 
 ARG UID=100
 ARG GID=101
diff --git a/docker-compose.yml b/docker-compose.yml
index 8760f56..0120eae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   bitcoin-core:
     build:
       dockerfile: ./bitcoind/Dockerfile
+      context: .
     image: bitcoind
     container_name: bitcoind-test
     volumes:
@@ -19,6 +20,7 @@ services:
   core-lightning:
     build:
       dockerfile: ./lightningd/Dockerfile
+      context: .
     image: lightningd
     container_name: lightningd-test
     command:
@@ -33,7 +35,6 @@ services:
     depends_on:
       bitcoin-core:
         condition: service_healthy
-        restart: true
     env_file:
       - ./assets/testnet-env
     environment:
diff --git a/lightningd/Dockerfile b/lightningd/Dockerfile
index e831aee..0a43b26 100644
--- a/lightningd/Dockerfile
+++ b/lightningd/Dockerfile
@@ -1,5 +1,5 @@
 # build stage for core lightning and clboss
-FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM}} alpine:3.18 as builder
+FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM:-linux/amd64}} alpine:3.18 as bitcoin-core
 
 ARG TARGETPLATFORM
 
@@ -50,7 +50,7 @@ RUN git clone --recurse-submodules https://github.com/ZmnSCPxj/clboss.git /clbos
     make install
 
 # final stage with runtime dependencies and pkgs
-FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM}} alpine:3.18 as runner
+FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM:-linux/amd64}} alpine:3.18 as runner
 
 LABEL maintainer.0="Lakshya Singh (@king-11)" \
   maintainer.1="Dev Random (@devrandom01)"