diff --git a/amd/Dockerfile b/Dockerfile.amd
similarity index 93%
rename from amd/Dockerfile
rename to Dockerfile.amd
index b24c610..63bdad8 100644
--- a/amd/Dockerfile
+++ b/Dockerfile.amd
@@ -17,7 +17,7 @@ WORKDIR /home/claymore
 RUN curl -Lks https://github.com/nanopool/Claymore-Dual-Miner/releases/download/v${CLAYMORE_VERSION}/Claymore.s.Dual.Ethereum.Decred_Siacoin_Lbry_Pascal.AMD.NVIDIA.GPU.Miner.v${CLAYMORE_VERSION}.-.LINUX.tar.gz | tar zxvf -
 # ENV GPU_FORCE_64BIT_PTR=0 GPU_MAX_HEAP_SIZE=100 GPU_USE_SYNC_OBJECTS=1 GPU_MAX_ALLOC_PERCENT=100 GPU_SINGLE_ALLOC_PERCENT=100
 
-COPY resources/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY resources/docker-entrypoint-amd.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/*
 
 ENV WALLET_ADDRESS="0x8d3c63a5121d346642e83b69a57a959abfb73812" \
diff --git a/nvidia/Dockerfile b/Dockerfile.nvidia
similarity index 93%
rename from nvidia/Dockerfile
rename to Dockerfile.nvidia
index 0c39f70..7dab9ef 100644
--- a/nvidia/Dockerfile
+++ b/Dockerfile.nvidia
@@ -18,7 +18,7 @@ WORKDIR /home/claymore
 RUN curl -Lks https://github.com/nanopool/Claymore-Dual-Miner/releases/download/v${CLAYMORE_VERSION}/Claymore.s.Dual.Ethereum.Decred_Siacoin_Lbry_Pascal.AMD.NVIDIA.GPU.Miner.v${CLAYMORE_VERSION}.-.LINUX.tar.gz | tar zxvf -
 ENV GPU_FORCE_64BIT_PTR=0 GPU_MAX_HEAP_SIZE=100 GPU_USE_SYNC_OBJECTS=1 GPU_MAX_ALLOC_PERCENT=100 GPU_SINGLE_ALLOC_PERCENT=100
 
-COPY resources/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY resources/docker-entrypoint-nvidia.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/*
 
 ENV WALLET_ADDRESS="0x8d3c63a5121d346642e83b69a57a959abfb73812" \
diff --git a/amd/resources/docker-entrypoint.sh b/resources/docker-entrypoint-amd.sh
similarity index 100%
rename from amd/resources/docker-entrypoint.sh
rename to resources/docker-entrypoint-amd.sh
diff --git a/nvidia/resources/docker-entrypoint.sh b/resources/docker-entrypoint-nvidia.sh
similarity index 100%
rename from nvidia/resources/docker-entrypoint.sh
rename to resources/docker-entrypoint-nvidia.sh
diff --git a/nvidia/resources/docker-compose.yml b/utils/docker-compose.yml
similarity index 100%
rename from nvidia/resources/docker-compose.yml
rename to utils/docker-compose.yml
diff --git a/nvidia/resources/nvidia-devices.sh b/utils/nvidia-devices.sh
similarity index 100%
rename from nvidia/resources/nvidia-devices.sh
rename to utils/nvidia-devices.sh