diff --git a/data/projects.yml b/data/projects.yml
index 19b8225d1ead0de636ce8e266b491ef19c92015a..5668b1a082cd169ba3d4e1ae73dc56a1a6682dd0 100644
--- a/data/projects.yml
+++ b/data/projects.yml
@@ -73,6 +73,13 @@ gitlab-com-runbooks:
     Describes system components, triage procedures, and commands to use in scenarios commonly faced
     by Gitlab.com production support engineers
 
+infrastructure:
+  name: Gitlab.com - infrastructure issue tracker
+  path: gitlab-com/infrastructure
+  link: https://gitlab.com/gitlab-com/infrastructure
+  description: |
+    Used to track the infrastructure work of GitLab.com itself
+
 gitlab-cookbooks:
   name: Gitlab.com - infrastructure node provisioning by role
   path: gitlab-cookbooks
diff --git a/data/team.yml b/data/team.yml
index 56cc1103a64420a41df11b0f5df41c6c0606648c..1865f5068584e62f476449773a53e4747da92f59 100644
--- a/data/team.yml
+++ b/data/team.yml
@@ -632,6 +632,10 @@
   picture: pablo.jpg
   twitter: psczg
   gitlab: pcarranza
+  projects:
+    infrastructure: maintainer
+    gitlab-com-runbooks: maintainer
+    gitlab-cookbooks: maintainer
   expertise:  |
               <li>On-call hero!</li>
   story:  |
@@ -2009,9 +2013,16 @@
   reports_to: Production Lead
   picture: daniele.jpg
   twitter: escociao
+  projects:
+    gitlab-com-infrastructure: maintainer
   gitlab: omame
+  embedded_with: |
+                 <li>Cloud Native Build</li>
   expertise: |
+             <li>On Call Hero!</li>
              <li>Deployment Expert</li>
+             <li>Terraform Expert</li>
+             <li>Cloud Native Expert</li>
   story:  |
           Daniele fell in love with computers when he started to use a Vic 20 very early in his life and never looked back.
           In his teenage years he replaced lego with pc components and suddenly his room became a messy computer lab.
@@ -2312,6 +2323,12 @@
   reports_to: Production Lead
   picture: jtevnan.jpg
   gitlab: jtevnan
+  projects:
+    gitlab-cookbooks: maintainer
+  embedded_with: |
+                 <li>Database</li>
+  expertise: |
+             <li>On-call hero!</li>
   story:  |
           Jason made his way into IT via the detour of studying metallurgy. After discovering that he understood database query plans much better than the periodic table, he switched majors and never looked back. When not attempting to automate everything, he is an avid cook, tries to be outdoors as much as he can and attempts to brew the perfect beer.
 
@@ -2348,6 +2365,8 @@
   picture: ilya.png
   twitter:
   gitlab: ilyaf
+  embedded_with: |
+                 <li>Security</li>
   story:  |
           Ilya is a self-taught UNIX System Administrator with strong interest in computer security. In those rare occasions when he's not
           configuring something, he enjoys a company of a good book.
@@ -2485,6 +2504,10 @@
   reports_to: Production Lead
   picture: victorlopez.jpg
   gitlab: victorcete
+  embedded_with: |
+                 <li>Search</li>
+  expertise: |
+             <li>Elasticsearch Expert</li>
   story:  |
           Victor is a technology enthusiast and a very passionate systems administrator.
           He enjoys all around automation, monitoring and development of tools that help everyone
diff --git a/source/handbook/infrastructure/index.html.md b/source/handbook/infrastructure/index.html.md
index 8f5847411192314882e167f3ef754f757bc3f268..09c90cffa1cf2fe3c594c2a69eaa509f2e541bc6 100644
--- a/source/handbook/infrastructure/index.html.md
+++ b/source/handbook/infrastructure/index.html.md
@@ -81,6 +81,33 @@ work on the topics listed above, using the principles and methods of [Site
 Reliability Engineering](https://landing.google.com/sre/book.html) a little bit
 more each day.
 
+#### Embedded Production Engineers
+
+Additionally, specific production engineers can be "embedded" with one or multiple
+different teams for anything from a few weeks to months.
+
+If you are an "embedded" Production Engineers, then you are expected to:
+
+- Participate in team calls for the team that you are embedded with.
+- Keep up to date with the general Production Engineering team and duties:
+   - Take care of issues, fires, and on-call. In fact, those will still be your
+priority unless the Lead explicitly says otherwise.
+   - Continue to report to the Production Lead and participate in the Production
+    team meetings.
+    - Share the context of the team you are embedded with, with the rest of the
+    Production Team.
+- Help the team that you are embedded with to make their feature set or service
+ "production ready".
+
+Since at GitLab most "feature sets or services" are mostly already in
+production, then it means that you work on making sure that the feature set or
+service _post factum_ meets the requirements for Production Readiness [TODO: add
+link to production readiness review questionnaire]. This will typically involve
+improving the runbooks and documentation, alerting, monitoring, coding for
+resiliency, etc. By the time you are done, any other member of the Production
+Team should be able to tend to the feature set or service in production as well
+as you can, and the "embedment" stops. At that point you should be listed as an
+expert in the respective service.
 
 ## Production and Staging Access
 
diff --git a/source/includes/team/member.html.haml b/source/includes/team/member.html.haml
index f2a40fe11e7cc7f1a67c0a54656ab64ef2008652..5cdaecefe292dd85d063fdbe8c3b0a030cd5bba7 100644
--- a/source/includes/team/member.html.haml
+++ b/source/includes/team/member.html.haml
@@ -42,6 +42,12 @@
           %ul
             = member.expertise
 
+      .embedded_with
+        - if member.embedded_with
+          Embedded With
+          %ul
+            = member.embedded_with
+
       .social
         - if member.twitter
           %a{href: "https://twitter.com/#{member.twitter}"}