diff --git a/www/project-data/wallaby.yaml b/www/project-data/wallaby.yaml
index 30b04baa4c..3039b37d33 100644
--- a/www/project-data/wallaby.yaml
+++ b/www/project-data/wallaby.yaml
@@ -35,10 +35,10 @@
   type: service
   has_user_guide: true
   has_in_tree_htaccess: true
-#- name: python-glanceclient
-#  service: Image service Python Bindings
-#  type: service-client
-#  description: glance client
+- name: python-glanceclient
+  service: Image service Python Bindings
+  type: service-client
+  description: glance client
 - name: glance_store
   deliverable-name: glance-store
   service: glance backend abstraction library
@@ -134,12 +134,12 @@
 #  type: networking
 #  has_install_guide: true
 #  has_admin_guide: true
-#- name: networking-sfc
-#  service: Service Function Chaining Networking service Plug-in
-#  type: networking
-#  has_install_guide: true
-#  has_config_ref: true
-#  has_user_guide: true
+- name: networking-sfc
+  service: Service Function Chaining Networking service Plug-in
+  type: networking
+  has_install_guide: true
+  has_config_ref: true
+  has_user_guide: true
 
 - name: horizon
   service: Dashboard
@@ -207,19 +207,19 @@
   service: Python agent for provisioning and deprovisioning Bare Metal servers
   type: baremetal
 
-#- name: magnum
-#  service: Container Infrastructure Management service
-#  service_type: container-infrastructure-management
-#  has_api_ref: true
-#  has_install_guide: true
-#  has_admin_guide: true
-#  has_config_ref: true
-#  has_user_guide: true
-#  type: service
-##- name: python-magnumclient
-#  service: Container Infrastructure Management service Python Bindings
-#  type: service-client
-#  description: magnum client
+- name: magnum
+  service: Container Infrastructure Management service
+  service_type: container-infrastructure-management
+  has_api_ref: true
+  has_install_guide: true
+  has_admin_guide: true
+  has_config_ref: true
+  has_user_guide: true
+  type: service
+- name: python-magnumclient
+  service: Container Infrastructure Management service Python Bindings
+  type: service-client
+  description: magnum client
 
 - name: trove
   service: Database service
@@ -295,10 +295,10 @@
   has_install_guide: true
   has_api_ref: true
   type: service
-#- name: python-swiftclient
-#  service: Object Storage service Python Bindings
-#  type: service-client
-#  description: swift client
+- name: python-swiftclient
+  service: Object Storage service Python Bindings
+  type: service-client
+  description: swift client
 
 - name: heat
   service: Orchestration service
@@ -310,16 +310,16 @@
   has_config_ref: true
   has_in_tree_htaccess: true
   type: service
-#- name: python-heatclient
-#  service: Orchestration service Python Bindings
-#  type: service-client
-#  description: heat client
+- name: python-heatclient
+  service: Orchestration service Python Bindings
+  type: service-client
+  description: heat client
 - name: heat-translator
   type: tool
   service: Translate non-heat templates to heat Orchestration Template
-#- name: tosca-parser
-#  type: tool
-#  service: Parser for TOSCA Simple Profile in YAML
+- name: tosca-parser
+  type: tool
+  service: Parser for TOSCA Simple Profile in YAML
 
 - name: manila
   service: Shared File Systems service
@@ -370,29 +370,29 @@
 #  type: service-client
 #  description: sahara client
 
-#- name: watcher
-#  service: Infrastructure Optimization service
-#  service_type: resource-optimization
-#  type: service
-#  has_install_guide: true
-#  has_admin_guide: true
-#  has_user_guide: true
-#  has_config_ref: true
-#  has_api_ref: true
-#- name: python-watcherclient
-#  service: Infrastructure Optimization service Python Bindings
-#  type: service-client
-#  description: watcher client
+- name: watcher
+  service: Infrastructure Optimization service
+  service_type: resource-optimization
+  type: service
+  has_install_guide: true
+  has_admin_guide: true
+  has_user_guide: true
+  has_config_ref: true
+  has_api_ref: true
+- name: python-watcherclient
+  service: Infrastructure Optimization service Python Bindings
+  type: service-client
+  description: watcher client
 
-#- name: mistral
-#  service: Workflow service
-#  service_type: workflow
-#  type: service
-#  has_admin_guide: true
-#- name: python-mistralclient
-#  service: Workflow service Python Bindings
-#  type: service-client
-#  description: mistral client
+- name: mistral
+  service: Workflow service
+  service_type: workflow
+  type: service
+  has_admin_guide: true
+- name: python-mistralclient
+  service: Workflow service Python Bindings
+  type: service-client
+  description: mistral client
 
 - name: murano
   service: Application Catalog service
@@ -402,10 +402,10 @@
   has_api_ref: true
   has_admin_guide: true
   has_config_ref: true
-# - name: python-muranoclient
-#   service: Application Catalog service Python Bindings
-#   type: service-client
-#   description: murano client
+- name: python-muranoclient
+  service: Application Catalog service Python Bindings
+  type: service-client
+  description: murano client
 
 - name: senlin
   service: Clustering service
@@ -447,10 +447,10 @@
   has_config_ref: true
   has_user_guide: true
   type: service
-#- name: python-tackerclient
-#  service: NFV Orchestration service Python Bindings
-#  type: service-client
-#  description: tacker client
+- name: python-tackerclient
+  service: NFV Orchestration service Python Bindings
+  type: service-client
+  description: tacker client
 
 - name: cloudkitty
   service: Rating service
@@ -458,10 +458,10 @@
   type: service
   has_admin_guide: true
   has_user_guide: true
-#- name: python-cloudkittyclient
-#  service: Rating service Python Bindings
-#  type: service-client
-#  description: cloudkitty client
+- name: python-cloudkittyclient
+  service: Rating service Python Bindings
+  type: service-client
+  description: cloudkitty client
 
 - name: vitrage
   service: RCA (Root Cause Analysis) service
@@ -490,11 +490,11 @@
   type: library
   has_install_guide: true
   has_user_guide: true
-#- name: castellan
-#  service: Key Manager interface abstraction
-#  type: library
-#  has_install_guide: true
-#  has_user_guide: true
+- name: castellan
+  service: Key Manager interface abstraction
+  type: library
+  has_install_guide: true
+  has_user_guide: true
 #- name: debtcollector
 #  type: library
 #  service:
@@ -510,32 +510,32 @@
 #    manner.
 #  has_install_guide: true
 #  has_user_guide: true
-#- name: oslo.cache
-#  type: library
-#  service: Cache management library.
-#  has_config_ref: true
-#  has_install_guide: true
-#  has_user_guide: true
+- name: oslo.cache
+  type: library
+  service: Cache management library.
+  has_config_ref: true
+  has_install_guide: true
+  has_user_guide: true
 #- name: oslo.concurrency
 #  type: library
 #  service: External process management and task synchronization.
 #  has_user_guide: true
 #  has_install_guide: true
 #  has_config_ref: true
-#- name: oslo.config
-#  type: library
-#  service: Configuration option parsing from the command line or configuration files.
-#  has_config_ref: true
-#- name: oslo.context
-#  type: library
-#  service: Helpers to maintain useful information about a request context.
-#  has_install_guide: true
-#  has_user_guide: true
-#- name: oslo.db
-#  type: library
-#  service: Database connectivity.
-#  has_install_guide: true
-#  has_user_guide: true
+- name: oslo.config
+  type: library
+  service: Configuration option parsing from the command line or configuration files.
+  has_config_ref: true
+- name: oslo.context
+  type: library
+  service: Helpers to maintain useful information about a request context.
+  has_install_guide: true
+  has_user_guide: true
+- name: oslo.db
+  type: library
+  service: Database connectivity.
+  has_install_guide: true
+  has_user_guide: true
 #- name: oslo.i18n
 #  type: library
 #  service: Internationalization and translation.
@@ -547,30 +547,30 @@
 #  has_install_guide: true
 #  has_admin_guide: true
 #  has_user_guide: true
-#- name: oslo.messaging
-#  type: library
-#  service: Inter-process communication.
-#  has_admin_guide: true
-#  has_user_guide: true
-#  has_config_ref: true
-#- name: oslo.middleware
-#  type: library
-#  service: WSGI middleware library for web service development.
-#  has_config_ref: true
-#  has_install_guide: true
-#  has_admin_guide: true
-#- name: oslo.policy
-#  type: library
-#  service: Common policy enforcement.
-#  has_install_guide: true
-#  has_admin_guide: true
-#  has_config_ref: true
-#  has_user_guide: true
-#- name: oslo.privsep
-#  type: library
-#  service: library for privilege separation
-#  has_install_guide: true
-#  has_user_guide: true
+- name: oslo.messaging
+  type: library
+  service: Inter-process communication.
+  has_admin_guide: true
+  has_user_guide: true
+  has_config_ref: true
+- name: oslo.middleware
+  type: library
+  service: WSGI middleware library for web service development.
+  has_config_ref: true
+  has_install_guide: true
+  has_admin_guide: true
+- name: oslo.policy
+  type: library
+  service: Common policy enforcement.
+  has_install_guide: true
+  has_admin_guide: true
+  has_config_ref: true
+  has_user_guide: true
+- name: oslo.privsep
+  type: library
+  service: library for privilege separation
+  has_install_guide: true
+  has_user_guide: true
 #- name: oslo.reports
 #  type: library
 #  service: Error report framework for projects.
@@ -581,36 +581,36 @@
 #  service: Fine filtering of shell commands to run as root.
 #  has_install_guide: true
 #  has_user_guide: true
-#- name: oslo.serialization
-#  type: library
-#  service: Serialization with special handling for some common types.
-#  has_install_guide: true
-#  has_user_guide: true
-#- name: oslo.service
-#  type: library
-#  service: Library for running and managing OpenStack services.
-#  has_config_ref: true
-#  has_install_guide: true
-#  has_user_guide: true
-#- name: oslo.upgradecheck
-#  type: library
-#  service: Library of common code for upgrade checks.
-#- name: oslo.utils
-#  type: library
-#  service: Library of common low-level utility modules.
-#  has_install_guide: true
-#  has_user_guide: true
-#- name: oslo.versionedobjects
-#  type: library
-#  service: Database and RPC object schema versioning.
-#  has_install_guide: true
-#  has_config_ref: true
-#  has_user_guide: true
-#- name: oslo.vmware
-#  type: library
-#  service: Common functionality required by VMware drivers in several projects.
-#  has_install_guide: true
-#  has_user_guide: true
+- name: oslo.serialization
+  type: library
+  service: Serialization with special handling for some common types.
+  has_install_guide: true
+  has_user_guide: true
+- name: oslo.service
+  type: library
+  service: Library for running and managing OpenStack services.
+  has_config_ref: true
+  has_install_guide: true
+  has_user_guide: true
+- name: oslo.upgradecheck
+  type: library
+  service: Library of common code for upgrade checks.
+- name: oslo.utils
+  type: library
+  service: Library of common low-level utility modules.
+  has_install_guide: true
+  has_user_guide: true
+- name: oslo.versionedobjects
+  type: library
+  service: Database and RPC object schema versioning.
+  has_install_guide: true
+  has_config_ref: true
+  has_user_guide: true
+- name: oslo.vmware
+  type: library
+  service: Common functionality required by VMware drivers in several projects.
+  has_install_guide: true
+  has_user_guide: true
 #- name: oslotest
 #  type: library
 #  service: Unit test and fixture framework.
@@ -620,22 +620,22 @@
 #  type: library
 #  service: Cross-Project profiling library.
 #  has_user_guide: true
-#- name: stevedore
-#  type: library
-#  service: Manages dynamic plug-ins for Python applications.
-#  has_install_guide: true
-#  has_user_guide: true
+- name: stevedore
+  type: library
+  service: Manages dynamic plug-ins for Python applications.
+  has_install_guide: true
+  has_user_guide: true
 #- name: taskflow
 #  type: library
 #  service: Makes task execution easy, consistent, and reliable.
 #  has_user_guide: true
-#- name: tooz
-#  type: library
-#  service:
-#    Distributed primitives like group membership protocol, lock
-#    service and leader elections.
-#  has_user_guide: true
-#  has_install_guide: true
+- name: tooz
+  type: library
+  service:
+    Distributed primitives like group membership protocol, lock
+    service and leader elections.
+  has_user_guide: true
+  has_install_guide: true
 
 - name: octavia
   service: Load-balancer service
@@ -675,31 +675,30 @@
   has_user_guide: true
   type: service
 
-#- name: monasca-api
-#  service: Monitoring service
-#  type: service
-#  service_type: monitoring
-#  has_api_ref: false
-#  has_install_guide: false
-#  has_config_ref: false
-#  has_admin_guide: false
-#  has_user_guide: true
-
+- name: monasca-api
+  service: Monitoring service
+  type: service
+  service_type: monitoring
+  has_api_ref: false
+  has_install_guide: false
+  has_config_ref: false
+  has_admin_guide: false
+  has_user_guide: true
 - name: python-monascaclient
   service: Monitoring service client
   type: service-client
   description: monasca client
 
-#- name: python-openstackclient
-#  service: Command line interface to OpenStack
-#  type: cloud-client
-#  description: OpenStack client
-#  has_config_ref: true
-#- name: cliff
-#  service: Builds command-line programs in Python.
-#  type: library
-#  has_install_guide: true
-#  has_user_guide: true
+- name: python-openstackclient
+  service: Command line interface to OpenStack
+  type: cloud-client
+  description: OpenStack client
+  has_config_ref: true
+- name: cliff
+  service: Builds command-line programs in Python.
+  type: library
+  has_install_guide: true
+  has_user_guide: true
 #- name: os-client-config
 #  service: Library for collecting client configuration for using an OpenStack cloud
 #  type: library
@@ -728,14 +727,14 @@
   has_config_ref: true
   has_user_guide: true
   type: service
-#- name: python-solumclient
-#  service: Software Development Lifecycle Automation client
-#  type: service-client
-#  description: solum client
+- name: python-solumclient
+  service: Software Development Lifecycle Automation client
+  type: service-client
+  description: solum client
 
-# - name: os-win
-#   service: Windows / Hyper-V library for OpenStack projects.
-#   type: library
+#- name: os-win
+#  service: Windows / Hyper-V library for OpenStack projects.
+#  type: library
 
 #- name: qinling
 #  service: Function as a Service for OpenStack
@@ -796,9 +795,9 @@
   service: Bridge between container framework and OpenStack abstractions
   type: service
 
-#- name: charm-guide
-#  type: deployment
-#  service: Understanding Juju Charms for deploying OpenStack
+- name: charm-guide
+  type: deployment
+  service: Understanding Juju Charms for deploying OpenStack
 
 - name: charm-deployment-guide
   service: OpenStack Charms Deployment
@@ -850,12 +849,11 @@
 #  has_install_guide: true
 #  has_user_guide: true
 
-#- name: adjutant
-#  service: Operations Processes Automation
-#  service_type: admin-logic
-#  type: service
-#  has_api_ref: true
+- name: adjutant
+  service: Operations Processes Automation
+  service_type: admin-logic
+  type: service
+  has_api_ref: true
 
 # Projects that do not appear in the service-types-authority list:
 # - kuryr
-# - dragonflow