diff --git a/org/contributors.yml b/org/contributors.yml
index aa8bc116..f927e442 100644
--- a/org/contributors.yml
+++ b/org/contributors.yml
@@ -70,6 +70,7 @@ contributors:
 - emmjohnson
 - evanfarrar
 - FelisiaM
+- fhanik
 - fifthposition
 - FloThinksPi
 - ForestEckhardt
diff --git a/toc/working-groups/foundational-infrastructure.md b/toc/working-groups/foundational-infrastructure.md
index e96a111d..565519b1 100644
--- a/toc/working-groups/foundational-infrastructure.md
+++ b/toc/working-groups/foundational-infrastructure.md
@@ -162,6 +162,8 @@ areas:
   reviewers:
   - name: Daniel Garnier-Moiroux
     github: kehrlann
+  - name: Filip Hanik
+    github: fhanik
   repositories:
   - cloudfoundry/cf-identity-acceptance-tests-release
   - cloudfoundry/cf-uaa-lib
@@ -197,6 +199,8 @@ areas:
     github: duanemay
   - name: Prateek Gangwal
     github: coolgang123
+  - name: Filip Hanik
+    github: fhanik
   repositories:
   - cloudfoundry/go-uaa
 - name: Integrated Databases (Mysql / Postgres)