diff --git a/docker-compose.yml b/docker-compose.yml
index 204dac7690..800e5cc2f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,11 +47,11 @@ services:
       SERVICE_TAGS: dev
       SERVICE_NAME: mysql
     healthcheck:
-      test: mysql -u ${SS_DB_USERNAME} --password=${SS_DB_PASSWORD} ${SS_DATABASE} -e 'SHOW TABLES;' | [ $(wc -l) -gt 885 ]
+      test: mysql -u ${SS_DB_USERNAME} --password=${SS_DB_PASSWORD} ${SS_DATABASE} -e 'SHOW TABLES;' | [ $(wc -l) -gt 300 ]
       interval: 60s
-      timeout: 10s
+      timeout: 60s
       retries: 60
-      start_period: 60s
+      start_period: 10s
     volumes:
       - ./docker-compose/mysql/model:/docker-entrypoint-initdb.d
       - /tmp/mysql/www-openstack/model:/var/lib/mysql
diff --git a/elections/code/infrastructure/active_records/FoundationMember.php b/elections/code/infrastructure/active_records/FoundationMember.php
index 121928391a..9f82f6b4e2 100644
--- a/elections/code/infrastructure/active_records/FoundationMember.php
+++ b/elections/code/infrastructure/active_records/FoundationMember.php
@@ -24,6 +24,7 @@ final class FoundationMember
     (
         'ShowDupesOnProfile' => "Boolean",
         'ResignDate'         => 'SS_Datetime',
+        'IndividualMemberJoinDate' => 'SS_Datetime',
     );
 
     private static $has_many = array
@@ -66,6 +67,7 @@ public function resign()
         }
         $this->owner->MembershipType = IOpenStackMember::MembershipTypeCommunity;
         $this->owner->ResignDate     = CustomMySQLDatabase::nowRfc2822();
+        $this->owner->IndividualMemberJoinDate = null;
     }
 
     public function onBeforeDelete()
@@ -97,6 +99,7 @@ public function upgradeToFoundationMember()
             $legalAgreement->write();
             $this->owner->MembershipType = IOpenStackMember::MembershipTypeFoundation;
             $this->owner->ResignDate  = null;
+            $this->owner->IndividualMemberJoinDate = null;
             $this->owner->write();
             return true;
         }
@@ -130,6 +133,11 @@ public function isCommunityMember()
         return $group || $this->isSpeaker() || $is_foundation_member;
     }
 
+    public function isIndividualMember():bool
+    {
+        return $this->owner->MembershipType == IOpenStackMember::MembershipTypeIndividual;
+    }
+
     /**
      * @return bool
      */
diff --git a/elections/templates/Layout/EditProfilePage_election.ss b/elections/templates/Layout/EditProfilePage_election.ss
index 92c406cc2b..74b8986e3d 100644
--- a/elections/templates/Layout/EditProfilePage_election.ss
+++ b/elections/templates/Layout/EditProfilePage_election.ss
@@ -3,7 +3,7 @@
 	<% require themedCSS(profile-section) %>
 		<h1>$Title</h1>
         <% if CurrentMember.isFoundationMember %>
-                <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl %>
+                <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl, RenewLink=$Top.RenewMembershipUrl %>
 
 				<% include ProfileNav %>
 
diff --git a/registration/code/infrastructure/active_records/MemberDeleted.php b/registration/code/infrastructure/active_records/MemberDeleted.php
index 5d52fc4f38..e9d6ab5dac 100644
--- a/registration/code/infrastructure/active_records/MemberDeleted.php
+++ b/registration/code/infrastructure/active_records/MemberDeleted.php
@@ -19,6 +19,6 @@ class MemberDeleted extends DataObject
         'Email'          => 'Varchar(254)',
         'OriginalID'     => 'Int',
         'FromUrl'        => 'Text',
-        'MembershipType' => "Enum('Foundation,Community,None', 'None')",
+        'MembershipType' => "Enum('Foundation,Community,None,Individual', 'None')",
     ];
 }
\ No newline at end of file
diff --git a/registration/code/infrastructure/active_records/OpenStackMember.php b/registration/code/infrastructure/active_records/OpenStackMember.php
index 8c1a295c41..4caa51e97c 100644
--- a/registration/code/infrastructure/active_records/OpenStackMember.php
+++ b/registration/code/infrastructure/active_records/OpenStackMember.php
@@ -21,7 +21,7 @@ class OpenStackMember
         'ThirdEmail'             => 'Varchar(254)', // See RFC 5321, Section 4.5.3.1.3. (256 minus the < and > character)
         'HasBeenEmailed'         => 'Boolean',
         'ShirtSize'              => "Enum('Extra Small, Small, Medium, Large, XL, XXL')",
-        'MembershipType'         => "Enum('Foundation,Community,None', 'None')",
+        'MembershipType'         => "Enum('Foundation,Community,None,Individual', 'None')",
         'StatementOfInterest'    => 'Text',
         'Bio'                    => 'HTMLText',
         'FoodPreference'         => 'Text',
diff --git a/registration/code/model/IOpenStackMember.php b/registration/code/model/IOpenStackMember.php
index 607dcddead..9a551304e9 100644
--- a/registration/code/model/IOpenStackMember.php
+++ b/registration/code/model/IOpenStackMember.php
@@ -21,6 +21,8 @@ interface IOpenStackMember
 
     const MembershipTypeCommunity  = 'Community';
 
+    const MembershipTypeIndividual = 'Individual';
+
     const MembershipTypeNone       = 'None';
     /**
      * @return string
diff --git a/registration/code/model/MemberManager.php b/registration/code/model/MemberManager.php
index ec38410070..feac87a6d0 100644
--- a/registration/code/model/MemberManager.php
+++ b/registration/code/model/MemberManager.php
@@ -235,6 +235,9 @@ public function registerByClaims($claims): Member
                if($member->isFoundationMember()){
                    $membershipType =  IOpenStackMember::MembershipTypeFoundation;
                }
+               else if($member->isIndividualMember()){
+                   $membershipType =  IOpenStackMember::MembershipTypeIndividual;
+               }
                else if($member->isCommunityMember()){
                    $membershipType =  IOpenStackMember::MembershipTypeCommunity;
                }
diff --git a/registration/code/ui/EditProfilePage.php b/registration/code/ui/EditProfilePage.php
index 916ab83138..9fbedc1460 100755
--- a/registration/code/ui/EditProfilePage.php
+++ b/registration/code/ui/EditProfilePage.php
@@ -550,6 +550,11 @@ public function ResignUrl()
         return $this->Link('resign');
     }
 
+    public function RenewMembershipUrl()
+    {
+        return 'https://deploy-preview-669--openinfra-dev.netlify.app/a/renew-membership';
+    }
+
     public function downgrade2communitymember()
     {
         $CurrentMember = Member::currentUser();
diff --git a/registration/templates/Layout/EditProfilePage.ss b/registration/templates/Layout/EditProfilePage.ss
index 3f852e27b8..1481cfe61f 100644
--- a/registration/templates/Layout/EditProfilePage.ss
+++ b/registration/templates/Layout/EditProfilePage.ss
@@ -34,7 +34,7 @@ $SetCurrentTab(1)
 				</div>
 			<% end_if %>
             $getRenderUITopExtensions
-            <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl %>
+            <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl, RenewLink=$Top.RenewMembershipUrl %>
 			<% include ProfileNav %>
 			<div class="profile-appearance">See how your <a href="/community/members/profile/{$CurrentMember.ID}/{$CurrentMember.NameSlug}">public profile</a> appears.</div>
 			$EditProfileForm
diff --git a/registration/templates/Layout/EditProfilePage_Training.ss b/registration/templates/Layout/EditProfilePage_Training.ss
index 03bebe5ba0..7df2d89ccd 100644
--- a/registration/templates/Layout/EditProfilePage_Training.ss
+++ b/registration/templates/Layout/EditProfilePage_Training.ss
@@ -3,7 +3,7 @@
     <% require themedCSS(profile-section) %>
     <h1>$Title</h1>
     <% if CurrentMember %>
-        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl %>
+        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl, RenewLink=$Top.RenewMembershipUrl %>
         <% include ProfileNav %>
         <% if CurrentMember.isTrainingAdmin  %>
             <form>
diff --git a/registration/templates/Layout/EditProfilePage_TrainingAddCourse.ss b/registration/templates/Layout/EditProfilePage_TrainingAddCourse.ss
index 0a22bda9dc..4fff66db9c 100644
--- a/registration/templates/Layout/EditProfilePage_TrainingAddCourse.ss
+++ b/registration/templates/Layout/EditProfilePage_TrainingAddCourse.ss
@@ -3,7 +3,7 @@
 	<% require themedCSS(profile-section) %>
 	<h1>$Title</h1>
 	<% if CurrentMember %>
-        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl %>
+        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl, RenewLink=$Top.RenewMembershipUrl %>
 	    <% include ProfileNav %>
 	    <% if CurrentMember.isTrainingAdmin %>
 	        $AddTrainingCourseForm
diff --git a/registration/templates/Layout/EditProfilePage_agreements.ss b/registration/templates/Layout/EditProfilePage_agreements.ss
index 8b4c468785..81409e743a 100644
--- a/registration/templates/Layout/EditProfilePage_agreements.ss
+++ b/registration/templates/Layout/EditProfilePage_agreements.ss
@@ -16,7 +16,7 @@
 	
 				
 				<% end_if %>
-                <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl %>
+                <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl, RenewLink=$Top.RenewMembershipUrl %>
 				<% include ProfileNav %>
 	
 				<form><fieldset>
diff --git a/registration/templates/Layout/EditProfilePage_downgrade2communitymember.ss b/registration/templates/Layout/EditProfilePage_downgrade2communitymember.ss
index b217fe0558..00a3c5bad0 100644
--- a/registration/templates/Layout/EditProfilePage_downgrade2communitymember.ss
+++ b/registration/templates/Layout/EditProfilePage_downgrade2communitymember.ss
@@ -3,7 +3,7 @@
 
     <h1>Downgrade To Community Member</h1>
     <% if CurrentMember %>
-        <p>If you select this option, you will be revoking your right to vote in elections and to commit code to OpenStack via Gerrit. Additionally, any administrative rights to the Marketplace Admin or Company Admin will be revoked.</p>
+        <p>If you select this option, you will be revoking your right to vote and run in elections.</p>
         <p><a href="{$Top.Link}downgrade2communitymember/?confirmed=1" class="roundedButton">Yes, Agree</a> &nbsp; <a
                 href="{$Top.Link}" class="roundedButton">Cancel</a></p>
 
diff --git a/registration/templates/Layout/EditProfilePage_marketplace_administration.ss b/registration/templates/Layout/EditProfilePage_marketplace_administration.ss
index d328cbaf1d..ea56d0dc07 100644
--- a/registration/templates/Layout/EditProfilePage_marketplace_administration.ss
+++ b/registration/templates/Layout/EditProfilePage_marketplace_administration.ss
@@ -3,7 +3,7 @@
     <% require themedCSS(profile-section) %>
     <h1>$Title</h1>
     <% if CurrentMember %>
-        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl %>
+        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl, RenewLink=$Top.RenewMembershipUrl %>
         <% include ProfileNav %>
         <% if CurrentMember.isMarketPlaceAdmin %>
             <fieldset>
diff --git a/registration/templates/Layout/EditProfilePage_speaker.ss b/registration/templates/Layout/EditProfilePage_speaker.ss
index 28edbc1558..2089dc7d15 100644
--- a/registration/templates/Layout/EditProfilePage_speaker.ss
+++ b/registration/templates/Layout/EditProfilePage_speaker.ss
@@ -7,12 +7,11 @@
     <h1>$Title</h1>
     <% if CurrentMember %>
         <% if Saved %>
-
             <div class="span-24 last siteMessage" id="SuccessMessage">
                 <p>Your Profile has been saved!</p>
             </div>
         <% end_if %>
-        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl %>
+        <% include CurrentUserInfoBox LogOutLink=$Top.LogoutUrl, ResignLink=$Top.ResignUrl, RenewLink=$Top.RenewMembershipUrl %>
         <% include ProfileNav %>
         $EditSpeakerProfileForm
     <% else %>
diff --git a/registration/templates/Layout/Includes/CurrentUserInfoBox.ss b/registration/templates/Layout/Includes/CurrentUserInfoBox.ss
index 37de9a619b..9042f83280 100644
--- a/registration/templates/Layout/Includes/CurrentUserInfoBox.ss
+++ b/registration/templates/Layout/Includes/CurrentUserInfoBox.ss
@@ -1,27 +1,37 @@
 <div class="loggedInBox">
     <div class="row">
+
         <div class="col-md-6" style="height: 35px;line-height: 35px;"><span style="display:inline-block; vertical-align:middle;">You are logged in as: <strong>$CurrentMember.Name</strong></span></div>
         <div class="col-md-6  text-right">
-            <a class="roundedButton" href="{$ResignLink}">Resign Membership</a>
-            <% if $CurrentMember.isFoundationMember %>
+            <% if not $CurrentMember.isIndividualMember %>
+                <a class="roundedButton" href="{$RenewLink}">Renew Membership</a>
+            <% end_if %>
+            <% if $CurrentMember.isIndividualMember %>
                 <a class="roundedButton downgrade-2-community-member" href="$Top.Link(downgrade2communitymember)">Change to Community Member</a>
-            <% else %>
-                <a class="roundedButton upgrade-2-foundation-member" href="$Top.Link(upgrade2foundationmember)">Make me a Foundation Member</a>
             <% end_if %>
+            <a class="roundedButton" href="{$ResignLink}">Resign Membership</a>
         </div>
     </div>
     <div class="row">
-        <% if $CurrentMember.isFoundationMember %>
+        <% if $CurrentMember.isIndividualMember %>
+            <div class="col-md-12" style="height: 35px;line-height: 35px;">
+                <span style="display:inline-block; vertical-align:middle;">Current Member Level: <strong>OIF Individual Member</strong></span>
+            </div>
+        <% else_if $CurrentMember.isFoundationMember %>
             <div class="col-md-12" style="height: 35px;line-height: 35px;">
-                <span style="display:inline-block; vertical-align:middle;">Current Member Level: <strong>Foundation Member</strong></span>
+                <span style="display:inline-block; vertical-align:middle;">Current Member Level: <strong>Foundation Member</strong>&nbsp;<a href="{$RenewLink}">(Renew your Membership)</a></span>
             </div>
         <% else_if $CurrentMember.isSpeaker %>
-            <div c class="col-md-12" style="height: 35px;line-height: 35px;">
+            <div class="col-md-12" style="height: 35px;line-height: 35px;">
                 <span style="display:inline-block; vertical-align:middle;">Current Member Level: <strong>Speaker</strong></span>
             </div>
         <% else_if $CurrentMember.isCommunityMember %>
-            <div c class="col-md-12" style="height: 35px;line-height: 35px;">
-                <span style="display:inline-block; vertical-align:middle;">Current Member Level: <strong>Community Member</strong></span>
+            <div class="col-md-12" style="height: 35px;line-height: 35px;">
+                <span style="display:inline-block; vertical-align:middle;">Current Member Level: <strong>Community Member</strong>&nbsp;<a href="{$RenewLink}">(Renew your Membership)</a></span>
+            </div>
+         <% else_if $CurrentMember.isIndividualMember %>
+            <div class="col-md-12" style="height: 35px;line-height: 35px;">
+                 <span style="display:inline-block; vertical-align:middle;">Current Member Level: <strong>OIF Individual Member</strong></span>
             </div>
         <% end_if %>
         </div>
diff --git a/registration/templates/Layout/Includes/ProfileNav.ss b/registration/templates/Layout/Includes/ProfileNav.ss
index d22c632ff9..ef989c0c44 100644
--- a/registration/templates/Layout/Includes/ProfileNav.ss
+++ b/registration/templates/Layout/Includes/ProfileNav.ss
@@ -1,7 +1,6 @@
 $NavMessageExtensions
 <h2 class="profile-tabs">
 <a href="{$Link}" <% if CurrentTab=1 %>class="active"<% end_if %> >Your Details</a>
-<a href="{$Link}agreements"  <% if CurrentTab=3 %>class="active"<% end_if %> >Legal Agreements</a>
 <% if CurrentMember.isTrainingAdmin %>
 	<a href="{$Link}training"  <% if CurrentTab=4 %>class="active"<% end_if %> >Training</a>
 <% end_if %>
diff --git a/start_local_server.sh b/start_local_server.sh
index 5c68cb472a..da11348caa 100755
--- a/start_local_server.sh
+++ b/start_local_server.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 export DOCKER_SCAN_SUGGEST=false
+export BUILDX_NO_DEFAULT_ATTESTATIONS=0
 docker compose run --rm app composer install
 docker compose run --rm app ./framework/sake installsake;
 docker compose run --rm app yarn install