diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..0bca29a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+addons:
+  apt:
+    packages:
+      - git
+      - make
+      - curl
+
+install:
+  - make init
+
+script:
+  - make terraform:install
+  - make terraform:get-plugins
+  - make terraform:get-modules
+  - make terraform:lint
+  - make terraform:validate
diff --git a/LICENSE b/LICENSE
index 6b9d898..808ecf3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 Cloud Posse, LLC
+   Copyright 2017-2018 Cloud Posse, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b0f7470
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+SHELL := /bin/bash
+
+-include $(shell curl -sSL -o .build-harness "https://git.io/build-harness"; echo .build-harness)
+
+lint:
+	$(SELF) terraform:install terraform:get-modules terraform:get-plugins terraform:lint terraform:validate
diff --git a/README.md b/README.md
index 969b829..6cd16c5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# terraform-aws-ecr
+# terraform-aws-ecr [![Build Status](https://travis-ci.org/cloudposse/terraform-aws-ecr.svg)](https://travis-ci.org/cloudposse/terraform-aws-ecr)
 
 Terraform module to provision an [`AWS ECR Docker Container registry`](https://aws.amazon.com/ecr/).
 
@@ -36,9 +36,9 @@ module "ecr" {
 
 |  Name                        |  Default       |  Description                                                                                             | Required|
 |:----------------------------:|:--------------:|:--------------------------------------------------------------------------------------------------------:|:-------------:|
-| `namespace`                  | `global`       | Namespace (e.g. `cp` or `cloudposse`) - required for `tf_label` module                                   | Yes           |
-| `stage`                      | `default`      | Stage (e.g. `prod`, `dev`, `staging` - required for `tf_label` module                                    | Yes           |
-| `name`                       | `admin`        | The Name of the application or solution  (e.g. `bastion` or `portal`) - required for `tf_label` module   | Yes           |
+| `namespace`                  | `global`       | Namespace (e.g. `cp` or `cloudposse`)                                                                    | Yes           |
+| `stage`                      | `default`      | Stage (e.g. `prod`, `dev`, `staging`)                                                                    | Yes           |
+| `name`                       | `admin`        | The Name of the application or solution  (e.g. `bastion` or `portal`)                                    | Yes           |
 | `roles`                      | `[]`           | List of IAM role names that will be granted permissions to use the container registry                    | No (optional) |
 
 
diff --git a/main.tf b/main.tf
index cd635bb..e09bcf4 100644
--- a/main.tf
+++ b/main.tf
@@ -89,7 +89,7 @@ data "aws_iam_policy_document" "resource" {
 }
 
 module "label" {
-  source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.2.1"
+  source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.1"
   namespace  = "${var.namespace}"
   stage      = "${var.stage}"
   name       = "${var.name}"