diff --git a/Dockerfile b/Dockerfile
index 085a4d9..dfea76b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,4 +3,4 @@ FROM hashicorp/tfci
 LABEL maintainer="docker@2martens.de" description="Terraform for Drone"
 COPY tool.sh /usr/local/bin
 RUN chmod +x /usr/local/bin/tool.sh
-ENTRYPOINT ["tool.sh"]
+ENTRYPOINT ["/usr/local/bin/tool.sh"]
diff --git a/tool.sh b/tool.sh
index dcc87d4..a30b178 100644
--- a/tool.sh
+++ b/tool.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-TF_API_TOKEN=$PLUGIN_API_TOKEN\
- TF_CLOUD_ORGANIZATION=$PLUGIN_CLOUD_ORGANIZATION\
- tfci run $PLUGIN_ARGS
+/usr/local/bin/tfci --organization="$PLUGIN_CLOUD_ORGANIZATION" --token="$PLUGIN_API_TOKEN" run $PLUGIN_ARGS