diff --git a/README.rst b/README.rst
index ce1eb96..a34cdfb 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
 ECS Deploy
 ----------
 
-.. image:: https://travis-ci.org/fabfuel/ecs-deploy.svg?branch=develop
-    :target: https://travis-ci.org/fabfuel/ecs-deploy
+.. image:: https://travis-ci.com/fabfuel/ecs-deploy.svg?branch=develop
+    :target: https://travis-ci.com/github/fabfuel/ecs-deploy
 
 .. image:: https://scrutinizer-ci.com/g/fabfuel/ecs-deploy/badges/coverage.png?b=develop
     :target: https://scrutinizer-ci.com/g/fabfuel/ecs-deploy
@@ -85,7 +85,7 @@ Currently the following actions are supported:
 
 deploy
 ======
-Redeploy a service either without any modifications or with a new image, environment variable and/or command definition.
+Redeploy a service either without any modifications or with a new image, environment variable, docker label, and/or command definition.
 
 scale
 =====
@@ -93,12 +93,12 @@ Scale a service up or down and change the number of running tasks.
 
 run
 ===
-Run a one-off task based on an existing task-definition and optionally override command and/or environment variables.
+Run a one-off task based on an existing task-definition and optionally override command, environment variables and/or docker labels.
 
 update
 ======
 Update a task definition by creating a new revision to set a new image,
-environment variable and/or command definition, etc.
+environment variable, docker label, and/or command definition, etc.
 
 cron (scheduled task)
 =====================
@@ -230,6 +230,36 @@ To reset all existing secrets (secret environment variables) of a task definitio
 
 This will remove **all other** existing secret environment variables of **all containers** of the task definition, except for the new secret variable `NEW_SECRET` with the value coming from the AWS Parameter Store with the name "KEY_OF_SECRET_IN_PARAMETER_STORE" in the webserver container.
 
+
+Set a docker label
+===================
+To add a new or adjust an existing docker labels of a specific container, run the following command::
+
+    $ ecs deploy my-cluster my-service -d webserver somelabel somevalue
+
+This will modify the **webserver** container definition and add or overwrite the docker label "somelabel" with the value "somevalue". This way you can add new or adjust already existing docker labels.
+
+
+Adjust multiple docker labels
+=============================
+You can add or change multiple docker labels at once, by adding the `-d` (or `--docker-label`) options several times::
+
+    $ ecs deploy my-cluster my-service -d webserver somelabel somevalue -d webserver otherlabel othervalue -d app applabel appvalue
+
+This will modify the definition **of two containers**.
+The **webserver**'s docker label "somelabel" will be set to "somevalue" and the label "otherlabel" to "othervalue".
+The **app**'s docker label "applabel" will be set to "appvalue".
+
+
+Set docker labels exclusively, remove all other pre-existing docker labels
+==========================================================================
+To reset all existing docker labels of a task definition, use the flag ``--exclusive-docker-labels`` ::
+
+    $ ecs deploy my-cluster my-service -d webserver somelabel somevalue --exclusive-docker-labels
+
+This will remove **all other** existing docker labels of **all containers** of the task definition, except for the label "somelabel" with the value "somevalue" in the webserver container.
+
+
 Modify a command
 ================
 To change the command of a specific container, run the following command::
diff --git a/ecs_deploy/cli.py b/ecs_deploy/cli.py
index 884fed3..6a3cdd9 100644
--- a/ecs_deploy/cli.py
+++ b/ecs_deploy/cli.py
@@ -38,7 +38,9 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--essential', type=(str, bool), multiple=True, help='Overwrites the essential value for a container: <container> <essential>')
 @click.option('-e', '--env', type=(str, str, str), multiple=True, help='Adds or changes an environment variable: <container> <name> <value>')
 @click.option('--env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load environment variables from .env-file')
+@click.option('--s3-env-file', type=(str, str), multiple=True, required=False, help='Location of .env-file in S3 in ARN format (eg arn:aws:s3:::/bucket_name/object_name')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-u', '--ulimit', type=(str, str, int, int), multiple=True, help='Adds or changes a ulimit variable in the container description (Not available for Fargate): <container> <ulimit name> <softlimit value> <hardlimit value>')
 @click.option('--system-control', type=(str, str, str), multiple=True, help='Adds or changes a system control variable in the container description (Not available for Fargate): <container> <namespace> <value>')
 @click.option('-p', '--port', type=(str, int, int), multiple=True, help='Adds or changes a port mappings in the container description (Not available for Fargate): <container> <container port value> <host port value>')
@@ -64,6 +66,8 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--rollback/--no-rollback', default=False, help='Rollback to previous revision, if deployment failed (default: --no-rollback)')
 @click.option('--exclusive-env', is_flag=True, default=False, help='Set the given environment variables exclusively and remove all other pre-existing env variables from all containers')
 @click.option('--exclusive-secrets', is_flag=True, default=False, help='Set the given secrets exclusively and remove all other pre-existing secrets from all containers')
+@click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
+@click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--sleep-time', default=1, type=int, help='Amount of seconds to wait between each check of the service (default: 1)')
 @click.option('--slack-url', required=False, help='Webhook URL of the Slack integration. Can also be defined via environment variable SLACK_URL')
 @click.option('--slack-service-match', default=".*", required=False, help='A regular expression for defining, which services should be notified. (default: .* =all). Can also be defined via environment variable SLACK_SERVICE_MATCH')
@@ -74,7 +78,7 @@ def get_client(access_key_id, secret_access_key, region, profile):
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
 @click.option('--add-container', type=str, multiple=True, required=False, help='Add a placeholder container in the task definition.')
 @click.option('--remove-container', type=str, multiple=True, required=False, help='Remove a container from the task definition.')
-def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, privileged, essential, env, env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, slack_service_match='.*'):
+def deploy(cluster, service, tag, image, command, health_check, cpu, memory, memoryreservation, privileged, essential, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, task, region, access_key_id, secret_access_key, profile, timeout, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, ignore_warnings, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, sleep_time, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, add_container, remove_container, slack_url, docker_label, exclusive_docker_labels, slack_service_match='.*'):
     """
     Redeploy or modify a service.
 
@@ -104,6 +108,8 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
         td.set_privileged(**{key: value for (key, value) in privileged})
         td.set_essential(**{key: value for (key, value) in essential})
         td.set_environment(env, exclusive_env, env_file)
+        td.set_docker_labels(docker_label, exclusive_docker_labels)
+        td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
         td.set_secrets(secret, exclusive_secrets)
         td.set_ulimits(ulimit, exclusive_ulimits)
         td.set_system_controls(system_control, exclusive_system_controls)
@@ -172,12 +178,14 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--privileged', type=(str, bool), multiple=True, help='Overwrites the memory reservation value for a container: <container> <memoryreservation>')
 @click.option('-e', '--env', type=(str, str, str), multiple=True, help='Adds or changes an environment variable: <container> <name> <value>')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-u', '--ulimit', type=(str, str, int, int), multiple=True, help='Adds or changes a ulimit variable in the container description (Not available for Fargate): <container> <ulimit name> <softlimit value> <hardlimit value>')
 @click.option('--system-control', type=(str, str, str), multiple=True, help='Adds or changes a system control variable in the container description (Not available for Fargate): <container> <namespace> <value>')
 @click.option('-p', '--port', type=(str, int, int), multiple=True, help='Adds or changes a port mappings in the container description (Not available for Fargate): <container> <container port value> <host port value>')
 @click.option('-m', '--mount', type=(str, str, str), multiple=True, help='Adds or changes a mount points in the container description (Not available for Fargate): <container> <container port value> <host port value>')
 @click.option('-l', '--log', type=(str, str, str, str), multiple=True, help='Adds or changes a log configuration in the container description (Not available for Fargate): <container> <log driver> <option name> <option value>')
 @click.option('--env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load environment variables from .env-file')
+@click.option('--s3-env-file', type=(str, str), multiple=True, required=False, help='Location of .env-file in S3 in ARN format (eg arn:aws:s3:::/bucket_name/object_name')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
 @click.option('-x', '--execution-role', type=str, help='Sets the execution\'s role ARN: <execution role ARN>')
 @click.option('--region', help='AWS region (e.g. eu-central-1)')
@@ -195,6 +203,8 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--rollback/--no-rollback', default=False, help='Rollback to previous revision, if deployment failed (default: --no-rollback)')
 @click.option('--exclusive-env', is_flag=True, default=False, help='Set the given environment variables exclusively and remove all other pre-existing env variables from all containers')
 @click.option('--exclusive-secrets', is_flag=True, default=False, help='Set the given secrets exclusively and remove all other pre-existing secrets from all containers')
+@click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
+@click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--slack-url', required=False, help='Webhook URL of the Slack integration. Can also be defined via environment variable SLACK_URL')
 @click.option('--slack-service-match', default=".*", required=False, help='A regular expression for defining, deployments of which crons should be notified. (default: .* =all). Can also be defined via environment variable SLACK_SERVICE_MATCH')
 @click.option('--exclusive-ulimits', is_flag=True, default=False, help='Set the given ulimits exclusively and remove all other pre-existing ulimits from all containers')
@@ -202,7 +212,7 @@ def deploy(cluster, service, tag, image, command, health_check, cpu, memory, mem
 @click.option('--exclusive-ports', is_flag=True, default=False, help='Set the given port mappings exclusively and remove all other pre-existing port mappings from all containers')
 @click.option('--exclusive-mounts', is_flag=True, default=False, help='Set the given mount points exclusively and remove all other pre-existing mount points from all containers')
 @click.option('--volume', type=(str, str), multiple=True, required=False, help='Set volume mapping from host to container in the task definition.')
-def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, privileged, env, env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, diff, deregister, rollback, exclusive_env, exclusive_secrets, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume):
+def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservation, privileged, env, env_file, s3_env_file, secret, ulimit, system_control, port, mount, log, role, execution_role, region, access_key_id, secret_access_key, newrelic_apikey, newrelic_appid, newrelic_region, newrelic_revision, comment, user, profile, diff, deregister, rollback, exclusive_env, exclusive_secrets, exclusive_s3_env_file, slack_url, slack_service_match, exclusive_ulimits, exclusive_system_controls, exclusive_ports, exclusive_mounts, volume, docker_label, exclusive_docker_labels):
     """
     Update a scheduled task.
 
@@ -225,6 +235,8 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
         td.set_memoryreservation(**{key: value for (key, value) in memoryreservation})
         td.set_privileged(**{key: value for (key, value) in privileged})
         td.set_environment(env, exclusive_env, env_file)
+        td.set_docker_labels(docker_label, exclusive_docker_labels)
+        td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
         td.set_secrets(secret, exclusive_secrets)
         td.set_ulimits(ulimit, exclusive_ulimits)
         td.set_system_controls(system_control, exclusive_system_controls)
@@ -273,7 +285,9 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('-c', '--command', type=(str, str), multiple=True, help='Overwrites the command in a container: <container> <command>')
 @click.option('-e', '--env', type=(str, str, str), multiple=True, help='Adds or changes an environment variable: <container> <name> <value>')
 @click.option('--env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load environment variables from .env-file')
+@click.option('--s3-env-file', type=(str, str), multiple=True, required=False, help='Location of .env-file in S3 in ARN format (eg arn:aws:s3:::/bucket_name/object_name')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('-r', '--role', type=str, help='Sets the task\'s role ARN: <task role ARN>')
 @click.option('--region', help='AWS region (e.g. eu-central-1)')
 @click.option('--access-key-id', help='AWS access key id')
@@ -282,8 +296,10 @@ def cron(cluster, task, rule, image, tag, command, cpu, memory, memoryreservatio
 @click.option('--diff/--no-diff', default=True, help='Print what values were changed in the task definition')
 @click.option('--exclusive-env', is_flag=True, default=False, help='Set the given environment variables exclusively and remove all other pre-existing env variables from all containers')
 @click.option('--exclusive-secrets', is_flag=True, default=False, help='Set the given secrets exclusively and remove all other pre-existing secrets from all containers')
+@click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
+@click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--deregister/--no-deregister', default=True, help='Deregister or keep the old task definition (default: --deregister)')
-def update(task, image, tag, command, env, env_file, secret, role, region, access_key_id, secret_access_key, profile, diff, exclusive_env, exclusive_secrets, deregister):
+def update(task, image, tag, command, env, env_file, s3_env_file, secret, role, region, access_key_id, secret_access_key, profile, diff, exclusive_env, exclusive_s3_env_file, exclusive_secrets, deregister, docker_label, exclusive_docker_labels):
     """
     Update a task definition.
 
@@ -300,7 +316,9 @@ def update(task, image, tag, command, env, env_file, secret, role, region, acces
         td.set_images(tag, **{key: value for (key, value) in image})
         td.set_commands(**{key: value for (key, value) in command})
         td.set_environment(env, exclusive_env, env_file)
+        td.set_docker_labels(docker_label, exclusive_docker_labels)
         td.set_secrets(secret, exclusive_secrets)
+        td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
         td.set_role_arn(role)
 
         if diff:
@@ -367,7 +385,9 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
 @click.option('-c', '--command', type=(str, str), multiple=True, help='Overwrites the command in a container: <container> <command>')
 @click.option('-e', '--env', type=(str, str, str), multiple=True, help='Adds or changes an environment variable: <container> <name> <value>')
 @click.option('--env-file', type=(str, str), default=((None, None),), multiple=True, required=False, help='Load environment variables from .env-file')
+@click.option('--s3-env-file', type=(str, str), multiple=True, required=False, help='Location of .env-file in S3 in ARN format (eg arn:aws:s3:::/bucket_name/object_name')
 @click.option('-s', '--secret', type=(str, str, str), multiple=True, help='Adds or changes a secret environment variable from the AWS Parameter Store (Not available for Fargate): <container> <name> <parameter name>')
+@click.option('-d', '--docker-label', type=(str, str, str), multiple=True, help='Adds or changes a docker label: <container> <name> <value>')
 @click.option('--launchtype', type=click.Choice([LAUNCH_TYPE_EC2, LAUNCH_TYPE_FARGATE]), default=LAUNCH_TYPE_EC2, help='ECS Launch type (default: EC2)')
 @click.option('--subnet', type=str, multiple=True, help='A subnet ID to launch the task within. Required for launch type FARGATE (multiple values possible)')
 @click.option('--securitygroup', type=str, multiple=True, help='A security group ID to launch the task within. Required for launch type FARGATE (multiple values possible)')
@@ -378,8 +398,10 @@ def scale(cluster, service, desired_count, access_key_id, secret_access_key, reg
 @click.option('--secret-access-key', help='AWS secret access key')
 @click.option('--profile', help='AWS configuration profile name')
 @click.option('--exclusive-env', is_flag=True, default=False, help='Set the given environment variables exclusively and remove all other pre-existing env variables from all containers')
+@click.option('--exclusive-docker-labels', is_flag=True, default=False, help='Set the given docker labels exclusively and remove all other pre-existing docker-labels from all containers')
+@click.option('--exclusive-s3-env-file', is_flag=True, default=False, help='Set the given s3 env files exclusively and remove all other pre-existing s3 env files from all containers')
 @click.option('--diff/--no-diff', default=True, help='Print what values were changed in the task definition')
-def run(cluster, task, count, command, env, env_file, secret, launchtype, subnet, securitygroup, public_ip, platform_version, region, access_key_id, secret_access_key, profile, exclusive_env, diff):
+def run(cluster, task, count, command, env, env_file, s3_env_file, secret, launchtype, subnet, securitygroup, public_ip, platform_version, region, access_key_id, secret_access_key, profile, exclusive_env, exclusive_s3_env_file, diff, docker_label, exclusive_docker_labels):
     """
     Run a one-off task.
 
@@ -395,6 +417,8 @@ def run(cluster, task, count, command, env, env_file, secret, launchtype, subnet
         td = action.get_task_definition(task)
         td.set_commands(**{key: value for (key, value) in command})
         td.set_environment(env, exclusive_env, env_file)
+        td.set_docker_labels(docker_label, exclusive_docker_labels)
+        td.set_s3_env_file(s3_env_file, exclusive_s3_env_file)
         td.set_secrets(secret)
 
         if diff:
diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index cee8b62..3484f0d 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -335,6 +335,12 @@ def diff_raw(self, task_b):
             containers_b[container]['secrets'] = {e['name']: e['valueFrom'] for e in
                                                   containers_b[container].get('secrets', {})}
 
+        for container in containers_a:
+            containers_a[container]['dockerLabels'] = containers_a[container].get('dockerLabels', {}).copy()
+
+        for container in containers_b:
+            containers_b[container]['dockerLabels'] = containers_b[container].get('dockerLabels', {}).copy()
+
         composite_a = {
             'containers': containers_a,
             'volumes': self.volumes,
@@ -370,6 +376,8 @@ def get_overrides(self):
                 override['environment'] = self.get_overrides_env(diff.value)
             elif diff.field == 'secrets':
                 override['secrets'] = self.get_overrides_secrets(diff.value)
+            elif diff.field == 'dockerLabels':
+                override['dockerLabels'] = self.get_overrides_docker_labels(diff.value)
         return overrides
 
     @staticmethod
@@ -397,6 +405,10 @@ def get_overrides_env(env):
     def get_overrides_secrets(secrets):
         return [{"name": s, "valueFrom": secrets[s]} for s in secrets]
 
+    @staticmethod
+    def get_overrides_docker_labels(dockerlabels):
+        return dockerlabels.copy()
+
     def set_images(self, tag=None, **images):
         self.validate_container_options(**images)
         for container in self.containers:
@@ -602,6 +614,98 @@ def apply_container_environment(self, container, new_environment, exclusive=Fals
             {"name": e, "value": merged[e]} for e in merged
         ]
 
+    def set_docker_labels(self, dockerlabel_list, exclusive=False):
+        dockerlabels = defaultdict(dict)
+        for label in dockerlabel_list:
+            dockerlabels[label[0]][label[1]] = label[2]
+        self.validate_container_options(**dockerlabels)
+        for container in self.containers:
+            if container[u'name'] in dockerlabels:
+                self.apply_docker_labels(
+                    container=container,
+                    new_dockerlabels=dockerlabels[container[u'name']],
+                    exclusive=exclusive,
+                )
+            elif exclusive is True:
+                self.apply_docker_labels(
+                    container=container,
+                    new_dockerlabels={},
+                    exclusive=exclusive,
+                )
+
+    def apply_docker_labels(self, container, new_dockerlabels, exclusive=False):
+        old_dockerlabels = container.get('dockerLabels', {})
+        
+        if exclusive is True:
+            merged = new_dockerlabels
+        else:
+            merged = old_dockerlabels.copy()
+            merged.update(new_dockerlabels)
+        
+        if old_dockerlabels == merged:
+            return
+        
+        diff = EcsTaskDefinitionDiff(
+            container=container[u'name'],
+            field=u'dockerLabels',
+            value=merged,
+            old_value=old_dockerlabels
+        )
+        self._diff.append(diff)
+        
+        container[u'dockerLabels'] = merged.copy()
+    def set_s3_env_file(self, s3_env_files, exclusive=False):
+        # environmentFiles in task definition https://docs.aws.amazon.com/AmazonECS/latest/developerguide/taskdef-envfiles.html
+        s3_files_by_container = defaultdict(list)
+        if s3_env_files:
+            multiple_s3_env_files = any(isinstance(i, tuple) for i in s3_env_files)
+            if not multiple_s3_env_files:
+                s3_files_by_container[s3_env_files[0]] = {s3_env_files[1]}
+            if multiple_s3_env_files:
+                for s3_file in s3_env_files:
+                    if s3_files_by_container[s3_file[0]]:
+                        s3_files_by_container[s3_file[0]].add(s3_file[1])
+                        break
+                    s3_files_by_container[s3_file[0]] = {s3_file[1]}
+
+        for container in self.containers:
+            if container[u'name'] in s3_files_by_container:
+                self.apply_s3_env_file(
+                    container=container,
+                    new_s3_env_file=s3_files_by_container[container[u'name']],
+                    exclusive=exclusive
+                )
+            elif exclusive is True:
+                self.apply_s3_env_file(
+                    container=container,
+                    new_s3_env_file={},
+                    exclusive=exclusive
+                )
+
+    def apply_s3_env_file(self, container, new_s3_env_file, exclusive=False):
+        s3_env_file = container.get('environmentFiles', {})
+        old_s3_env_file = {env_file['value'] for env_file in s3_env_file}
+
+        if exclusive is True:
+            merged = new_s3_env_file
+        else:
+            merged = old_s3_env_file.copy()
+            merged.update(new_s3_env_file)
+
+        if old_s3_env_file == merged:
+            return
+
+        diff = EcsTaskDefinitionDiff(
+            container=container[u'name'],
+            field=u'environmentFiles',
+            value=merged,
+            old_value=old_s3_env_file
+        )
+        self._diff.append(diff)
+        container[u'environmentFiles'] = [
+            {"value": e, "type": "s3"} for e in merged
+        ]
+
     def set_secrets(self, secrets_list, exclusive=False):
         secrets = defaultdict(dict)
 
@@ -1040,6 +1144,12 @@ def __repr__(self):
                 self.value,
                 self.old_value,
             ))
+        elif self.field == u'dockerLabels':
+            return '\n'.join(self._get_docker_label_diffs(
+                self.container,
+                self.value,
+                self.old_value,
+            ))
         elif self.container:
             return u'Changed %s of container "%s" to: "%s" (was: "%s")' % (
                 self.field,
@@ -1070,6 +1180,22 @@ def _get_environment_diffs(container, env, old_env):
                 diffs.append(message)
         return diffs
 
+    @staticmethod
+    def _get_docker_label_diffs(container, dockerlabels, old_dockerlabels):
+        msg = u'Changed dockerLabel "%s" of container "%s" to: "%s"'
+        msg_removed = u'Removed dockerLabel "%s" of container "%s"'
+        diffs = []
+        for name, value in dockerlabels.items():
+            old_value = old_dockerlabels.get(name)
+            if value != old_value or value and not old_value:
+                message = msg % (name, container, value)
+                diffs.append(message)
+        for old_name in old_dockerlabels.keys():
+            if old_name not in dockerlabels.keys():
+                message = msg_removed % (old_name, container)
+                diffs.append(message)
+        return diffs
+
     @staticmethod
     def _get_secrets_diffs(container, secrets, old_secrets):
         msg = u'Changed secret "%s" of container "%s" to: "%s"'
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 2f447b0..a6b2990 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -334,6 +334,22 @@ def test_deploy_previously_empty_environment_variable_with_value(get_client, run
     assert u'Successfully changed task definition to: test-task:2' in result.output
     assert u'Deployment successful' in result.output
 
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_s3_env_file_with_previous_value(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '--s3-env-file', 'webserver', 'arn:aws:s3:::centerfun/.env', '--s3-env-file', 'webserver', 'arn:aws:s3:::stormzone/.env'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed environmentFiles of container "webserver" to: "{\'arn:aws:s3:::stormzone/.env\', \'arn:aws:s3:::coolBuckets/dev/.env\', \'arn:aws:s3:::myS3bucket/myApp/.env\', \'arn:aws:s3:::centerfun/.env\'}" (was: "{\'arn:aws:s3:::coolBuckets/dev/.env\', \'arn:aws:s3:::myS3bucket/myApp/.env\'}")'
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
 
 @patch('ecs_deploy.cli.get_client')
 def test_deploy_exclusive_environment(get_client, runner):
@@ -357,6 +373,115 @@ def test_deploy_exclusive_environment(get_client, runner):
     assert u'Successfully changed task definition to: test-task:2' in result.output
     assert u'Deployment successful' in result.output
 
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_one_new_docker_laberl(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME,
+                                        '-d', 'application', 'foo', 'bar',
+                                        '-d', 'webserver', 'foo', 'baz'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "foo" of container "application" to: "bar"' in result.output
+    assert u'Changed dockerLabel "foo" of container "webserver" to: "baz"' in result.output
+    assert u'Changed dockerLabel "lorem" of container "webserver" to: "ipsum"' not in result.output
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_change_docker_label_empty_string(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '-d', 'application', 'foo', ''))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "foo" of container "application" to: ""' in result.output
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_new_empty_docker_label(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '-d', 'application', 'new', ''))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "new" of container "application" to: ""' in result.output
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_empty_docker_label_again(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '-d', 'webserver', 'empty', ''))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" not in result.output
+    assert u'Changed dockerLabel' not in result.output
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_previously_empty_docker_label_with_value(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '-d', 'webserver', 'empty', 'not-empty'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "empty" of container "webserver" to: "not-empty"' in result.output
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_exclusive_docker_label(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '-d', 'webserver', 'new-label', 'new-value', '--exclusive-docker-labels'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "new-label" of container "webserver" to: "new-value"' in result.output
+
+    assert u'Removed dockerLabel "foo" of container "webserver"' in result.output
+    assert u'Removed dockerLabel "lorem" of container "webserver"' in result.output
+
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
 
 @patch('ecs_deploy.cli.get_client')
 def test_deploy_exclusive_secret(get_client, runner):
@@ -419,6 +544,23 @@ def test_deploy_without_changing_environment_value(get_client, runner):
     assert u'Deployment successful' in result.output
 
 
+@patch('ecs_deploy.cli.get_client')
+def test_deploy_without_changing_docker_labels(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.deploy, (CLUSTER_NAME, SERVICE_NAME, '-d', 'webserver', 'foo', 'bar'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Deploying based on task definition: test-task:1" in result.output
+    assert u"Updating task definition" not in result.output
+    assert u'Changed dockerLabel' not in result.output
+    assert u'Successfully created revision: 2' in result.output
+    assert u'Successfully deregistered revision: 1' in result.output
+    assert u'Successfully changed task definition to: test-task:2' in result.output
+    assert u'Deployment successful' in result.output
+
+
 @patch('ecs_deploy.cli.get_client')
 def test_deploy_without_changing_secrets_value(get_client, runner):
     get_client.return_value = EcsTestClient('acces_key', 'secret_key')
@@ -756,6 +898,21 @@ def test_run_task_with_environment_var(get_client, runner):
     assert u"- arn:lorem:ipsum" in result.output
 
 
+@patch('ecs_deploy.cli.get_client')
+def test_run_task_with_docker_label(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.run, (CLUSTER_NAME, 'test-task', '2', '-d', 'application', 'foo', 'bar'))
+
+    assert not result.exception
+    assert result.exit_code == 0
+
+    assert u"Using task definition: test-task" in result.output
+    assert u'Changed dockerLabel "foo" of container "application" to: "bar"' in result.output
+    assert u"Successfully started 2 instances of task: test-task:2" in result.output
+    assert u"- arn:foo:bar" in result.output
+    assert u"- arn:lorem:ipsum" in result.output
+
+
 @patch('ecs_deploy.cli.get_client')
 def test_run_task_without_diff(get_client, runner):
     get_client.return_value = EcsTestClient('acces_key', 'secret_key')
@@ -1016,6 +1173,98 @@ def test_update_task_exclusive_environment(get_client, runner):
     assert u'Successfully created revision: 2' in result.output
 
 
+@patch('ecs_deploy.cli.get_client')
+def test_update_task_one_new_docker_label(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_1,
+                                        '-d', 'application', 'foo', 'bar',
+                                        '-d', 'webserver', 'foo', 'baz'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Update task definition based on: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "foo" of container "application" to: "bar"' in result.output
+    assert u'Changed dockerLabel "foo" of container "webserver" to: "baz"' in result.output
+    assert u'Changed dockerLabel "lorem" of container "webserver" to: "ipsum"' not in result.output
+    assert u'Successfully created revision: 2' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_update_task_change_docker_label_empty_string(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_1, '-d', 'application', 'foo', ''))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Update task definition based on: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "foo" of container "application" to: ""' in result.output
+    assert u'Successfully created revision: 2' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_update_task_new_empty_docker_label(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_1, '-d', 'application', 'new', ''))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Update task definition based on: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "new" of container "application" to: ""' in result.output
+    assert u'Successfully created revision: 2' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_update_task_empty_docker_label_again(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_1, '-d', 'webserver', 'empty', ''))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Update task definition based on: test-task:1" in result.output
+    assert u"Updating task definition" not in result.output
+    assert u'Changed dockerLabel' not in result.output
+    assert u'Successfully created revision: 2' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_update_task_previously_empty_docker_label_with_value(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_1, '-d', 'webserver', 'empty', 'not-empty'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Update task definition based on: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "empty" of container "webserver" to: "not-empty"' in result.output
+    assert u'Successfully created revision: 2' in result.output
+
+
+@patch('ecs_deploy.cli.get_client')
+def test_update_task_exclusive_docker_labels(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_1, '-d', 'webserver', 'new-label', 'new-value', '--exclusive-docker-labels'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Update task definition based on: test-task:1" in result.output
+    assert u"Updating task definition" in result.output
+    assert u'Changed dockerLabel "new-label" of container "webserver" to: "new-value"' in result.output
+
+    assert u'Removed dockerLabel "foo" of container "webserver"' in result.output
+    assert u'Removed dockerLabel "lorem" of container "webserver"' in result.output
+
+    assert u'Successfully created revision: 2' in result.output
+
+
 @patch('ecs_deploy.cli.get_client')
 def test_update_task_exclusive_secret(get_client, runner):
     get_client.return_value = EcsTestClient('acces_key', 'secret_key')
@@ -1068,6 +1317,20 @@ def test_update_task_without_changing_environment_value(get_client, runner):
     assert u'Successfully created revision: 2' in result.output
 
 
+@patch('ecs_deploy.cli.get_client')
+def test_update_task_without_changing_docker_labels(get_client, runner):
+    get_client.return_value = EcsTestClient('acces_key', 'secret_key')
+    result = runner.invoke(cli.update, (TASK_DEFINITION_ARN_1, '-d', 'webserver', 'foo', 'bar'))
+
+    assert result.exit_code == 0
+    assert not result.exception
+
+    assert u"Update task definition based on: test-task:1" in result.output
+    assert u"Updating task definition" not in result.output
+    assert u'Changed dockerLabel' not in result.output
+    assert u'Successfully created revision: 2' in result.output
+
+
 @patch('ecs_deploy.cli.get_client')
 def test_update_task_without_changing_secrets_value(get_client, runner):
     get_client.return_value = EcsTestClient('acces_key', 'secret_key')
@@ -1139,6 +1402,11 @@ def test_diff(get_client, runner):
     assert '+ "foobar"' in result.output
     assert 'remove: containers.webserver.environment' in result.output
     assert '- empty: ' in result.output
+    assert 'change: containers.webserver.dockerLabels.foo' in result.output
+    assert '- "bar"' in result.output
+    assert '+ "foobar"' in result.output
+    assert 'remove: containers.webserver.dockerLabels' in result.output
+    assert '- empty: ' in result.output
     assert 'change: containers.webserver.secrets.baz' in result.output
     assert '- "qux"' in result.output
     assert '+ "foobaz"' in result.output
@@ -1153,6 +1421,8 @@ def test_diff(get_client, runner):
     assert '+ "arn:test:another-role:1"' in result.output
     assert 'add: containers.webserver.environment' in result.output
     assert '+ newvar: "new value"' in result.output
+    assert 'add: containers.webserver.dockerLabel' in result.output
+    assert '+ newlabel: "new value"' in result.output
 
 
 @patch('ecs_deploy.cli.get_client')
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index 90a2a5e..f3285c6 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -30,14 +30,16 @@
 TASK_DEFINITION_CONTAINERS_1 = [
     {u'name': u'webserver', u'image': u'webserver:123', u'command': u'run',
      u'environment': ({"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
+     u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'}, {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
      u'secrets': ({"name": "baz", "valueFrom": "qux"}, {"name": "dolor", "valueFrom": "sit"}),
+     u'dockerLabels': {"foo": "bar", "lorem": "ipsum", "empty": ""},
      u'logConfiguration': {},
      u'ulimits': [{'name': 'memlock', 'softLimit': 256, 'hardLimit': 256}],
      u'systemControls': [{'namespace': 'net.core.somaxconn', 'value': '511'}],
      u'portMappings': [{'containerPort': 8080, 'hostPort': 8080}],
      u'mountPoints': [{'sourceVolume': 'volume', 'containerPath': '/container/path', 'readOnly': False}]},
     {u'name': u'application', u'image': u'application:123', u'command': u'run', u'environment': (),
-     u'logConfiguration': {},
+     u'logConfiguration': {}, u'dockerLabels': {},
      u'ulimits': [{'name': 'memlock', 'softLimit': 256, 'hardLimit': 256}],
      u'systemControls': [{'namespace': 'net.core.somaxconn', 'value': '511'}],
      u'portMappings': [{'containerPort': 8080, 'hostPort': 8080}],
@@ -52,14 +54,16 @@
 TASK_DEFINITION_CONTAINERS_2 = [
     {u'name': u'webserver', u'image': u'webserver:123', u'command': u'run',
      u'environment': ({"name": "foo", "value": "bar"}, {"name": "lorem", "value": "ipsum"}, {"name": "empty", "value": ""}),
+     u'environmentFiles': [{'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'}, {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'}],
      u'secrets': ({"name": "baz", "valueFrom": "qux"}, {"name": "dolor", "valueFrom": "sit"}),
+     u'dockerLabels': {"foo": "bar", "lorem": "ipsum", "empty": ""},
      u'logConfiguration': {},
      u'ulimits': [{'name': 'memlock', 'softLimit': 256, 'hardLimit': 256}],
      u'systemControls': [{'namespace': 'net.core.somaxconn', 'value': '511'}],
      u'portMappings': [{'containerPort': 8080, 'hostPort': 8080}],
      u'mountPoints': [{'sourceVolume': 'volume', 'containerPath': '/container/path', 'readOnly': False}]},
     {u'name': u'application', u'image': u'application:123', u'command': u'run', u'environment': (),
-     u'logConfiguration': {},
+     u'logConfiguration': {}, u'dockerLabels': {},
      u'ulimits': [{'name': 'memlock', 'softLimit': 256, 'hardLimit': 256}],
      u'systemControls': [{'namespace': 'net.core.somaxconn', 'value': '511'}],
      u'portMappings': [{'containerPort': 8080, 'hostPort': 8080}],
@@ -74,7 +78,8 @@
 TASK_DEFINITION_CONTAINERS_3 = [
     {u'name': u'webserver', u'image': u'webserver:456', u'command': u'execute',
      u'environment': ({"name": "foo", "value": "foobar"}, {"name": "newvar", "value": "new value"}),
-     u'secrets': ({"name": "baz", "valueFrom": "foobaz"}, {"name": "dolor", "valueFrom": "loremdolor"})},
+     u'secrets': ({"name": "baz", "valueFrom": "foobaz"}, {"name": "dolor", "valueFrom": "loremdolor"}),
+     u'dockerLabels': {"foo": "foobar", "newlabel": "new value"}},
     {u'name': u'application', u'image': u'application:123', u'command': u'run', u'environment': ()}
 ]
 TASK_DEFINITION_ROLE_ARN_3 = u'arn:test:another-role:1'
@@ -669,6 +674,59 @@ def test_task_set_environment_exclusively(task_definition):
     assert {'name': 'new-var', 'value': 'new-value'} in task_definition.containers[1]['environment']
 
 
+def test_task_set_docker_labels(task_definition):
+    assert len(task_definition.containers[0]['dockerLabels']) == 3
+
+    task_definition.set_docker_labels(((u'webserver', u'foo', u'baz'), (u'webserver', u'some-name', u'some-value')))
+
+    assert len(task_definition.containers[0]['dockerLabels']) == 4
+
+    assert 'foo' in task_definition.containers[0]['dockerLabels']
+    assert 'lorem' in task_definition.containers[0]['dockerLabels']
+    assert 'some-name' in task_definition.containers[0]['dockerLabels']
+
+def test_task_set_docker_label_exclusively(task_definition):
+    assert len(task_definition.containers[0]['dockerLabels']) == 3
+    assert len(task_definition.containers[1]['dockerLabels']) == 0
+
+    task_definition.set_docker_labels(((u'application', u'foo', u'baz'), (u'application', u'new-var', u'new-value')), exclusive=True)
+
+    assert len(task_definition.containers[0]['dockerLabels']) == 0
+    assert len(task_definition.containers[1]['dockerLabels']) == 2
+
+    assert task_definition.containers[0]['dockerLabels'] == {}
+    assert 'foo' in task_definition.containers[1]['dockerLabels']
+    assert 'new-var' in task_definition.containers[1]['dockerLabels']
+
+def test_task_set_s3_env_file_multiple_files(task_definition):
+    assert len(task_definition.containers[0]['environmentFiles']) == 2
+
+    task_definition.set_s3_env_file(((u'webserver', u'arn:aws:s3:::mycompany.domain.com/app/.env'), (u'webserver', u'arn:aws:s3:::melted.cheese.com/grilled/.env'), (u'proxyserver', u'arn:ars:s3:::pizza/dev/.env')))
+
+    assert len(task_definition.containers[0]['environmentFiles']) == 4
+
+    assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+    assert {'value': 'arn:aws:s3:::myS3bucket/myApp/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+    assert {'value': 'arn:aws:s3:::coolBuckets/dev/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+    assert {'value': 'arn:aws:s3:::melted.cheese.com/grilled/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+
+def test_task_set_s3_env_file_single_file(task_definition):
+    assert len(task_definition.containers[0]['environmentFiles']) == 2
+
+    task_definition.set_s3_env_file(((u'webserver', u'arn:aws:s3:::mycompany.domain.com/app/.env')))
+
+    assert len(task_definition.containers[0]['environmentFiles']) == 3
+    # assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+
+def test_task_set_s3_env_file_exclusively(task_definition):
+    assert len(task_definition.containers[0]['environmentFiles']) == 2
+
+    task_definition.set_s3_env_file((u'webserver', u'arn:aws:s3:::mycompany.domain.com/app/.env'), exclusive=True)
+
+    assert len(task_definition.containers[0]['environmentFiles']) == 1
+
+    assert {'value': 'arn:aws:s3:::mycompany.domain.com/app/.env', 'type': 's3'} in task_definition.containers[0]['environmentFiles']
+
 def test_task_set_secrets_exclusively(task_definition):
     assert len(task_definition.containers[0]['secrets']) == 2
 
@@ -900,6 +958,15 @@ def test_task_get_overrides_with_environment(task_definition):
     assert dict(name='foo', value='baz') in overrides[0]['environment']
 
 
+def test_task_get_overrides_with_docker_labels(task_definition):
+    task_definition.set_docker_labels((('webserver', 'foo', 'baz'),))
+    overrides = task_definition.get_overrides()
+    assert len(overrides) == 1
+    assert overrides[0]['name'] == 'webserver'
+    #assert 'foo' in overrides[0]['dockerLabels']
+    assert overrides[0]['dockerLabels']['foo'] == 'baz'
+
+
 def test_task_get_overrides_with_secrets(task_definition):
     task_definition.set_secrets((('webserver', 'foo', 'baz'),))
     overrides = task_definition.get_overrides()
@@ -946,6 +1013,13 @@ def test_task_get_overrides_environment(task_definition):
     assert environment[0] == dict(name='foo', value='bar')
 
 
+def test_task_get_overrides_docker_labels(task_definition):
+    dockerlabels = task_definition.get_overrides_docker_labels(dict(foo='bar'))
+    assert isinstance(dockerlabels, dict)
+    assert len(dockerlabels) == 1
+    assert dockerlabels['foo'] == 'bar'
+
+
 def test_task_get_overrides_secrets(task_definition):
     secrets = task_definition.get_overrides_secrets(dict(foo='bar'))
     assert isinstance(secrets, list)