diff --git a/README.mdown b/README.mdown
index 6247ae0..e8c5287 100644
--- a/README.mdown
+++ b/README.mdown
@@ -7,14 +7,14 @@ This is a part of the [Garrison](https://github.com/forward3d/garrison) security
 
 | Function Name | Description  |
 | ------------- | ------------- |
-| `check_encryption` | Alerts if encryption is not enabled for an RDS instance. |
+| `check_encryption` | Alerts if encryption is not enabled for an S3 bucket. |
 | `check_public_access_block` | Alerts if there are any buckets defined without a public access block. |
 
 ### Installation & Example
 
-Docker Hub - https://hub.docker.com/r/forward3d/garrison-agent-aws-rds/
+Docker Hub - https://hub.docker.com/r/forward3d/garrison-agent-aws-s3/
 
-    docker pull forward3d/garrison-agent-aws-rds
+    docker pull forward3d/garrison-agent-aws-s3
     docker run --rm -e "GARRISON_URL=https://garrison.internal.acme.com" forward3d/garrison-agent-aws-s3 check_encryption
     docker run --rm -e "GARRISON_URL=https://garrison.internal.acme.com" -e "GARRISON_AWS_REGIONS=eu-west-1,us-west-2" forward3d/garrison-agent-aws-s3 check_public_access
 
diff --git a/garrison/checks/check_encryption.rb b/garrison/checks/check_encryption.rb
index ec11ed5..d0a3470 100644
--- a/garrison/checks/check_encryption.rb
+++ b/garrison/checks/check_encryption.rb
@@ -8,13 +8,12 @@ def settings
         self.family ||= 'infrastructure'
         self.type ||= 'compliance'
         self.options[:regions] ||= 'all'
-        self.options[:engines] ||= 'all'
       end
 
       def key_values
         [
           { key: 'datacenter', value: 'aws' },
-          { key: 'aws-service', value: 'rds' },
+          { key: 'aws-service', value: 's3' },
           { key: 'aws-account', value: AwsHelper.whoami }
         ]
       end
@@ -75,7 +74,7 @@ def unecrypted_s3(region)
             end
           end
         end
-        puts unencrypted_buckets.count
+
         unencrypted_buckets
       end
     end
diff --git a/garrison/checks/check_public_access_block.rb b/garrison/checks/check_public_access_block.rb
index 91b975e..4f42c5d 100644
--- a/garrison/checks/check_public_access_block.rb
+++ b/garrison/checks/check_public_access_block.rb
@@ -8,13 +8,12 @@ def settings
         self.family ||= 'infrastructure'
         self.type ||= 'compliance'
         self.options[:regions] ||= 'all'
-        self.options[:engines] ||= 'all'
       end
 
       def key_values
         [
           { key: 'datacenter', value: 'aws' },
-          { key: 'aws-service', value: 'rds' },
+          { key: 'aws-service', value: 's3' },
           { key: 'aws-account', value: AwsHelper.whoami }
         ]
       end