diff --git a/Dockerfile b/Dockerfile
index dfea76b..bf8f450 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
-FROM hashicorp/tfci
+FROM amazonlinux:2023
+
+RUN yum install -y yum-utils shadow-utils
+RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/AmazonLinux/hashicorp.repo
+RUN yum -y install terraform
 
 LABEL maintainer="docker@2martens.de" description="Terraform for Drone"
 COPY tool.sh /usr/local/bin
diff --git a/README.md b/README.md
index ccec285..d5a0b6c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@ This Drone plugin uses the Terraform CLI and makes it compatible with Drone.
   image: 2martens/terraform-drone-plugin
   settings:
     api_token: <api_token>
-    cloud_organization: <cloud_organization>
     path: <path relative to Git repo>
     args: <args>
 ```
@@ -39,8 +38,6 @@ steps:
     settings:
       api_token:
         from_secret: api_token
-      cloud_organization:
-        from_secret: cloud_organization
       path: terraform
       args: plan
 ```
\ No newline at end of file
diff --git a/tool.sh b/tool.sh
index 366407b..654d0d8 100644
--- a/tool.sh
+++ b/tool.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 cd "$PLUGIN_PATH" && \
- /usr/local/bin/tfci \
-  -organization="$PLUGIN_CLOUD_ORGANIZATION" \
-  -token="$PLUGIN_API_TOKEN" $PLUGIN_ARGS
+ TF_TOKEN_app_terraform_io=$PLUGIN_API_TOKEN \
+ terraform $PLUGIN_ARGS