diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml
new file mode 100644
index 000000000..3eca1fef2
--- /dev/null
+++ b/config/general_config/featureset040.yml
@@ -0,0 +1,74 @@
+# Summary of the feature set.
+# Deploy a containerized stable/pike Openstack environment and upgrade it
+
+undercloud_setup: true
+enable_pacemaker: true
+overcloud_ipv6: false
+
+containerized_overcloud: true
+containerized_overcloud_upgrade: true
+major_upgrade_script: major-upgrade-overcloud-containers.sh.j2
+upgrade_undercloud_repo_script: upgrade-repo-tripleo-ci.sh.j2
+upgrade_overcloud_repo_template: overcloud-repo-tripleo-ci.yaml.j2
+
+# save time by doing a mixed upgrade
+step_pre_undercloud_upgrade: true
+step_upgrade_undercloud: false
+release: master # until we have a stable/queens
+mixed_upgrade: true
+overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates"
+overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates
+overcloud_templates_branch: stable/{{ overcloud_release }}
+
+undercloud_generate_service_certificate: false
+
+ssl_overcloud: false
+
+test_ping: true
+run_tempest: false
+step_introspect: false
+
+composable_scenario: multinode-containers.yaml
+upgrade_composable_scenario: multinode-containers.yaml
+
+# options below direct automatic doc generation by tripleo-collect-logs
+artcl_gen_docs: true
+artcl_create_docs_payload:
+  included_deployment_scripts:
+    - undercloud-install
+    - overcloud-custom-tht-script
+    - overcloud-prep-containers
+    - overcloud-prep-flavors
+    - overcloud-prep-images
+    - overcloud-prep-network
+    - overcloud-deploy
+    - overcloud-deploy-post
+    - overcloud-upgrade
+    - overcloud-validate
+  included_static_docs:
+    - env-setup-virt
+  table_of_contents:
+    - env-setup-virt
+    - undercloud-install
+    - overcloud-custom-tht-script
+    - overcloud-prep-containers
+    - overcloud-prep-flavors
+    - overcloud-prep-images
+    - overcloud-prep-network
+    - overcloud-deploy
+    - overcloud-deploy-post
+    - overcloud-upgrade
+    - overcloud-validate
+composable_roles: true
+overcloud_roles:
+  - name: Controller
+    CountDefault: 1
+    tags:
+      - primary
+      - controller
+    networks:
+      - External
+      - InternalApi
+      - Storage
+      - StorageMgmt
+      - Tenant