diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 31277f8f..9969f00d 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -2,6 +2,7 @@ slack:
   notify_channel: releng-notify
 
 github:
+  delete_branch_on_merge: true
   version_tag_format: v{{version}}
   minor_bump_labels:
     - "Version: Bump Minor"
diff --git a/.travis.yml b/.travis.yml
index 07dbc902..d028f807 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,28 +34,20 @@ matrix:
   - rvm: 2.0
   - rvm: 2.2
   - rvm: 2.3
-    env: SUITE=ubuntu
-  - rvm: 2.3
-    env: SUITE=windows-server
-  - rvm: 2.3
-    env: SUITE=centos
+  - rvm: 2.4
+  - rvm: 2.5.1
+  # - rvm: 2.3
+  #   env: SUITE=ubuntu
+  # - rvm: 2.3
+  #   env: SUITE=windows-server
+  # - rvm: 2.3
+  #   env: SUITE=centos
 
-before_script:
-  - ci/before-script.sh
-  # put terraform on PATH
-  - export PATH="$PWD/bin:$PATH"
+# before_script:
+#   - ci/before-script.sh
+#   # put terraform on PATH
+#   - export PATH="$PWD/bin:$PATH"
 
 script:
   - bundle exec rake travis:ci
-  - ci/run-acceptance-tests.sh
-
-env:
-  global:
-    # access key id
-    - secure: "b/O77C/ebnrXw/xSTRMcAuhmUz9QH//jfh3XSQrZF2lRJZJbAbfL3L3SPLqQmPkMDJWCAJrs82umQJkZ0RJtSqX5ZzPUqdf2v5O4CyrfMqhQbsEA9GGUlBNaQmSWUHvOCPQZzI5GWMxgQb9Bhl4+ZekUoTgNZBjvh9uAHWuT1c1fNt5pHDYMXg4wyEnyF8tzLRVD5eTJwkKd+BodM1BUvdOITYv2xl6hlg7ZoJbo+onIVc8sRTnEjGiuprhaVyMSeTNSzxa/3jDxeX+HnJ/2HwpenIBXoSskZZViZHMd1Vy2sDUfYPfDjqwr389b8SInCehe1cCD8ouAr/7614IXxwoWSMjrVgkboB+KteRZyz0qVoqCpdS6NX0YBmu5I8T6jHr3OXVwVbcK03FrFhnS2Hg+oLhKLPKMvIFQ5347DEZ1LBv0ol//ltjk/cZX11yLiF2TrrDzSca3jb7kN/LJZ2AbGQdLJnqEhBm4NznHlPYfibLum0QwNXR/lZ47OJjBQnKc9nlN+iEOKbhby6/SCnW30xWJoMfNIULmW79heaNip16wDV0DBu44mmbKcFA6KMrNFex2+QpZGmNwbWJrwnvaJqVc6FNpRtNdShQ/81vJpn5Z6KKz676EHsM6LcXha1WnNj3eLYipWIg+4OSSmHJgRiuNC4JsgsYCaBfrDw8="
-    # secret access key
-    - secure: "Ut5ARdSnWiFVAtRZ7U+CPgihi59J/KgsMFXunJjBCYyfwaDxrIsAbjddhP3lu2d/xLtvQ26SodhnMh6VMfgBFljY1s4lgjlZU2xU5RCpXFsEhUzHjryVTEgEWYgWkGrTfvalB9gnrsRxiyOh6ZvlW7QoPED+j75FSGwj6rjGCYf/7oUa3Qlt2Pymma5ijjvemgcIEKngO7Dnh3dpFR/J4S0AZdZG6HtJvYpQ2gdvH5faFjYlKHp8W/PMuOuxq2w8Pcjw009VgOjLoFAFYhFWX3hGd0b+N1xBHJDlqaBk2UCCqaKtYrhAsgQNkFiPMmNdDUtscjKx81A8fBUJOUhUxWBFhL3QM2ymuZziPQcnikpi6EPRHRyv3P6MOSyEB2DPpzFq/tEniTBW6o9QL6dHYOaPm/CBtUJ36gEvrSEJQZyhxUTQdamjWIMOTcq1/uwjp0T28rdth0o4BoGALkNQxjaV9iPHBCNtZgPdLoG9v/5CyGwlRQaY6JSVxBHdRcD9+BfwLT84K+68NPo7xXBBar0B1kBOLExI3EHLTxaspkicM2DINicUZk+SNFdInuiByv9NT7sWWbISnk6EagxPxu8D2p1zcMh6cJ8DfFz0rws+ndGiPwInjoslSV7N8Ndi4j9nTKtv9qAImJlthzPDbHY8ghz0TrXWdtwzPet7j2s="
-    # region
-    - secure: "AJSnI8RyC2NKc91+NFerdZibfCCOZ/nfm0SoSCobYbgqB8R4ii1OqHBFaG+HAA4RnxwOoMm/C+lxRkdK6GcztJSzjOx4bTJE8FfFQ1i+LvLRTuQRL1v9iLfJN0O5iJszq4ecm3jSsFYGpCh1z9OCJEnqaEya9ZNfY7U4wpCy4DG6oIUCxKRtXRUaBOqli+6SqeR/CJxp4ws7lzIu5gSWwuWoqTijO3iR3xLT0EIOkguaTfXD3lTzPhfGvV4LMd/Z/cHqxbVnLEpDCaOwiurHQOGvN9RU3vpOhH0d518QqWw0dQdu3o3cAf6wK+TZNdKo2ooDU9JccqcPS5dPiM+doqqEC55Lxfj2l+BMUeyteZt5YdtELDDe49M7gziGSfqNc8bcWFEu5mPpl0jBd4cvp1EiJNlqNK10HAr/jiI/QGSTX0FK+kpWo56E1uWbgxrLZWAnN7g7sE8y80SLE2AlGlb/MzvpNRoJcGjxltxpznbQJ5Q9EUm3vbzCgOMX0BAgeHciwX6CSTrWIciUmbRrXfZ/9NPLrNph6qQ5I3uJ77CvK3pzpUqEt9L0HJ+Wh6ZBxwFsiddtBFNE0lqV6/FkU9ws1ovF5o9jOTE7mzq4ve6GAtqCnIxmHDq/plw0idbmzuHnsehgLD1ZksYl2WIXsWWOApLIH1U+YzGNyGnLqhk="
-    # windows admin password
-    - secure: "lxe9NYpwV19g2mBa7aQoJX372hktSSn/g5oU1GDWYpi59YwpbYXP/Al/XXwq1ZfNzN+BlXw3tJPlVaEkfSQBi0AaWLJ6Kw5+a4tkIkwMyMPJQh+pKnADZK2pd+Hhrr7CRtnaT6w4V2sZCIfcdlLnKmez/BMNNdBn1+WAfE+aN224JK43rXxgLe4B9CcXCsUUORh6nJbB5f60D15qYokDu7ILi0RufyfyiJulqxIsXVNKtnUXOJRXZvDOPp9Y+2ur0HmVK7aiWr6JwXtODgrrDzZiWq99eR2ErDJB1AFUVMmudUykf5SWyivhvB4RStYDIIpG8EXrIhRKP+k9o4loqQBRcRBGvEMLdyupi7TzuryzK7j2XzhJFD9Eg+50Y5By87lRfvltuAJaDkRPfwIzSbWsh0Lb7YwUXI9a+bJebsteTPSFjb1YOYvkQCV2CB5pH68QInw8Hu9o2hmUkuoNWqqvVaxDI8z3peympfFlVtvTC9eOI60Tdv+pSCyQhBN0/II8FT/fylwQsOL+i8Hez9NIRdaRkx0JEpY56NloErd4An9zpY/xCAa/6JfzMWn7eD673MRVJW0u/j5IGuRAksuUlGZTQS+qudF4ZgVJaacm6qARULaesuCNbufZYtRB0Hg+GINQrUSfYKBw6BZUk2T9ZQ2zFsnF12k0yl9Qr7I="
+  # - ci/run-acceptance-tests.sh
diff --git a/Gemfile b/Gemfile
index ed7f4fe0..f422fb0e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ end
 
 if RUBY_VERSION =~ /^2/
   group :chefstyle do
-    gem "chefstyle"
+    gem "chefstyle", "~> 0.4.0"
   end
 end
 
diff --git a/PRODUCT_MATRIX.md b/PRODUCT_MATRIX.md
index 3a007ae2..6584434a 100644
--- a/PRODUCT_MATRIX.md
+++ b/PRODUCT_MATRIX.md
@@ -8,6 +8,7 @@
 | Chef Backend | chef-backend |
 | Chef Server | chef-server |
 | Chef Server HA Provisioning for AWS | chef-server-ha-provisioning |
+| Chef Workstation | chef-workstation |
 | Chef Development Kit | chefdk |
 | Chef Compliance | compliance |
 | Delivery | delivery |
diff --git a/acceptance/.suites/ubuntu_install_checksum/terraform/aws.tf b/acceptance/.suites/ubuntu_install_checksum/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/.suites/ubuntu_install_checksum/terraform/aws.tf
+++ b/acceptance/.suites/ubuntu_install_checksum/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/.suites/windows-nano/terraform/aws.tf b/acceptance/.suites/windows-nano/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/.suites/windows-nano/terraform/aws.tf
+++ b/acceptance/.suites/windows-nano/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/centos_install_checksum/terraform/aws.tf b/acceptance/centos_install_checksum/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/centos_install_checksum/terraform/aws.tf
+++ b/acceptance/centos_install_checksum/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/ubuntu_install_command/terraform/aws.tf b/acceptance/ubuntu_install_command/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/ubuntu_install_command/terraform/aws.tf
+++ b/acceptance/ubuntu_install_command/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/ubuntu_install_command_once/terraform/aws.tf b/acceptance/ubuntu_install_command_once/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/ubuntu_install_command_once/terraform/aws.tf
+++ b/acceptance/ubuntu_install_command_once/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/ubuntu_install_sh/terraform/aws.tf b/acceptance/ubuntu_install_sh/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/ubuntu_install_sh/terraform/aws.tf
+++ b/acceptance/ubuntu_install_sh/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/windows-server-2012r2-checksum/terraform/aws.tf b/acceptance/windows-server-2012r2-checksum/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/windows-server-2012r2-checksum/terraform/aws.tf
+++ b/acceptance/windows-server-2012r2-checksum/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/windows-server-2012r2-fips/terraform/aws.tf b/acceptance/windows-server-2012r2-fips/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/windows-server-2012r2-fips/terraform/aws.tf
+++ b/acceptance/windows-server-2012r2-fips/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/windows-server-2012r2-once/terraform/aws.tf b/acceptance/windows-server-2012r2-once/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/windows-server-2012r2-once/terraform/aws.tf
+++ b/acceptance/windows-server-2012r2-once/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/acceptance/windows-server-2012r2-ps1/terraform/aws.tf b/acceptance/windows-server-2012r2-ps1/terraform/aws.tf
index 85b319a2..2d0cf8ce 100644
--- a/acceptance/windows-server-2012r2-ps1/terraform/aws.tf
+++ b/acceptance/windows-server-2012r2-ps1/terraform/aws.tf
@@ -4,5 +4,5 @@
 # under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
 provider "aws" {
   region  = "${var.aws_region}"
-  profile = "chef-aws"
+  profile = "chef-es"
 }
diff --git a/lib/mixlib/install/product.rb b/lib/mixlib/install/product.rb
index f23dcffa..eb89075b 100644
--- a/lib/mixlib/install/product.rb
+++ b/lib/mixlib/install/product.rb
@@ -276,6 +276,12 @@ def products_available_on_downloads_site
     downloads_product_page_url :not_available
   end
 
+  product "chef-workstation" do
+    product_name "Chef Workstation"
+    package_name "chef-workstation"
+    github_repo "chef/chef-workstation"
+  end
+
   product "chefdk" do
     product_name "Chef Development Kit"
     package_name "chefdk"
diff --git a/spec/unit/mixlib/install/product_spec.rb b/spec/unit/mixlib/install/product_spec.rb
index 36258871..57384d14 100644
--- a/spec/unit/mixlib/install/product_spec.rb
+++ b/spec/unit/mixlib/install/product_spec.rb
@@ -140,6 +140,7 @@
     chef-backend
     chef-server
     chef-server-ha-provisioning
+    chef-workstation
     chefdk
     compliance
     delivery