diff --git a/README.md b/README.md
index 39c1688..1598267 100644
--- a/README.md
+++ b/README.md
@@ -44,15 +44,12 @@ The following environment are supported:
 - IMGIX_UPLOAD_ACC_S3_SECRET_KEY=<IMGIX S3 secret key> (required)
 - IMGIX_UPLOAD_ACC_S3_BUCKET_URL=<IMGIX S3 Bucket URL> (required)
 - IMGIX_UPLOAD_ACC_S3_BUCKET=<IMGIX S3 Bucket name> (required)
-- IMGIX_UPLOAD_ACC_S3_DISTRIBUTION_ID=<IMGIX CloudFront distribution ID>
 - IMGIX_UPLOAD_DEV_S3_API_KEY=<IMGIX S3 API key> (required)
 - IMGIX_UPLOAD_DEV_S3_SECRET_KEY=<IMGIX S3 secret key> (required)
 - IMGIX_UPLOAD_DEV_S3_BUCKET_URL=<IMGIX S3 Bucket URL> (required)
 - IMGIX_UPLOAD_DEV_S3_BUCKET=<IMGIX S3 Bucket name> (required)
-- IMGIX_UPLOAD_DEV_S3_DISTRIBUTION_ID=<IMGIX CloudFront distribution ID>
 - IMGIX_UPLOAD_PROD_S3_API_KEY=<IMGIX S3 API key> (required)
 - IMGIX_UPLOAD_PROD_S3_SECRET_KEY=<IMGIX S3 secret key> (required)
 - IMGIX_UPLOAD_PROD_S3_BUCKET_URL=<IMGIX S3 Bucket URL> (required)
 - IMGIX_UPLOAD_PROD_S3_BUCKET=<IMGIX S3 Bucket name> (required)
-- IMGIX_UPLOAD_PROD_S3_DISTRIBUTION_ID=<IMGIX CloudFront distribution ID>
 - IMGIX_UPLOAD_S3_DATA_CACHE_CONTROL=max-age=15768000
diff --git a/package.json b/package.json
index a4f7d04..5178de5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fdmg/imgix-upload",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Command-line tool to upload images to the FDMG IMGIX S3 Bucket",
   "main": "dist/app.js",
   "preferGlobal": true,
@@ -20,7 +20,7 @@
     "dogfood2": "dotenv fiu -- -v -s -i ./public/images",
     "help": "node -r dotenv/config dist/app.js --help",
     "start": "node -r dotenv/config dist/app.js -o ./imageMap.json -i ./images -s",
-    "start2": "node -r dotenv/config dist/app.js -o ./imageMap.json -i ./public/images -s",
+    "start2": "node -r dotenv/config dist/app.js -e development -o ./imageMap.json -i ./public/images -s",
     "release:fdmg": "node modifyPackageJson.js -s @fdmg",
     "release:fdmediagroep": "node modifyPackageJson.js -s @fdmediagroep",
     "test": "echo \"Error: no test specified\" && exit 1",
diff --git a/src/app.ts b/src/app.ts
index 2431e88..2607b3f 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -76,14 +76,27 @@ const argv: any = yargs(process.argv.slice(2)).options({
   },
 }).argv;
 
-const Bucket = argv.bucket || process.env.IMGIX_UPLOAD_ACC_S3_BUCKET;
-console.log(`S3 Bucket: ${Bucket}`);
+function getBucket(environment: string) {
+  let result = "";
+  switch (environment) {
+    case "development":
+      result = process.env.IMGIX_UPLOAD_DEV_S3_BUCKET;
+    case "acceptance":
+      result = process.env.IMGIX_UPLOAD_ACC_S3_BUCKET;
+    case "production":
+      result = process.env.IMGIX_UPLOAD_DEV_S3_BUCKET;
+  }
+  return result;
+}
+
 const CacheControl =
   argv.cacheControl || process.env.IMGIX_UPLOAD_S3_DATA_CACHE_CONTROL;
 console.log(`Cache-control: ${CacheControl}`);
 console.log(`Dry-run: ${!!argv.dryRun}`);
 const environment = argv.environment || process.env.ENVIRONMENT;
 console.log(`Environment: ${environment}`);
+const Bucket = argv.bucket || getBucket(environment);
+console.log(`S3 Bucket: ${Bucket}`);
 let imagesFolder =
   argv.imagesFolder || process.env.IMGIX_UPLOAD_RELATIVE_IMAGE_FOLDER_LOCATION;
 imagesFolder =
@@ -114,20 +127,16 @@ const credentials = {
   accessKeyId: process.env.IMGIX_UPLOAD_DEV_S3_API_KEY,
   secretAccessKey: process.env.IMGIX_UPLOAD_DEV_S3_SECRET_KEY,
 };
-let distributionId = process.env.IMGIX_UPLOAD_DEV_S3_DISTRIBUTION_ID;
 switch (environment) {
   case "production":
-    distributionId = process.env.IMGIX_UPLOAD_PROD_S3_DISTRIBUTION_ID;
     credentials.accessKeyId = process.env.IMGIX_UPLOAD_PROD_S3_API_KEY;
     credentials.secretAccessKey = process.env.IMGIX_UPLOAD_PROD_S3_SECRET_KEY;
     break;
   case "acceptance":
-    distributionId = process.env.IMGIX_UPLOAD_ACC_S3_DISTRIBUTION_ID;
     credentials.accessKeyId = process.env.IMGIX_UPLOAD_ACC_S3_API_KEY;
     credentials.secretAccessKey = process.env.IMGIX_UPLOAD_ACC_S3_SECRET_KEY;
     break;
   case "development":
-    distributionId = process.env.IMGIX_UPLOAD_DEV_S3_DISTRIBUTION_ID;
     credentials.accessKeyId = process.env.IMGIX_UPLOAD_DEV_S3_API_KEY;
     credentials.secretAccessKey = process.env.IMGIX_UPLOAD_DEV_S3_SECRET_KEY;
     break;
@@ -154,14 +163,16 @@ async function uploadToS3(absolutePath: string, hashedFileName: string) {
     mime.contentType(absolutePath.replace(/\//g, "")) || undefined;
   if (!argv.dryRun) {
     try {
-      console.log({
-        Bucket,
-        CacheControl,
-        Key: hashedFileName,
-        ContentType,
-        ContentEncoding: "gzip",
-        ACL: "public-read",
-      });
+      if (debug) {
+        console.log({
+          Bucket,
+          CacheControl,
+          Key: hashedFileName,
+          ContentType,
+          ContentEncoding: "gzip",
+          ACL: "public-read",
+        });
+      }
       // Put object to S3.
       await s3
         .upload({